фикс модуля write-offs

diff --git a/erp24/views/write-offs/index.php b/erp24/views/write-offs/index.php
index d50877c9b7a8ce0f0b8f900e053b250285141b21..bf56f5d22cff5a6d94b6a7f958325656b766575b 100644 (file)
--- a/erp24/views/write-offs/index.php
+++ b/erp24/views/write-offs/index.php
@@ -7,70 +7,87 @@ include_once(dirname(__DIR__, 2) . "/inc/design_new.php");
 
 error_reporting(E_ALL ^ E_NOTICE);
 
-$modul="write-offs";
-
-$where=""; $get="";
-if(!empty($_REQUEST["date1"])) {$date1=htmlentities($_REQUEST["date1"]); $where .=" AND date>='$date1'";  $get .="&date1=$date1";  }
-if(!empty($_REQUEST["date2"])) {$date2=htmlentities($_REQUEST["date2"]);  $where .=" AND date<='$date2'"; $get .="&date2=$date2";}
-if(!empty($_REQUEST["store_id"])) {$store_id=htmlentities($_REQUEST["store_id"]);  $where .=" AND store_id='$store_id'"; $get .="&store_id=$store_id";}
+$modul = "write-offs";
+
+$where = "";
+$get = "";
+if (!empty($_REQUEST["date1"])) {
+    $date1 = htmlentities($_REQUEST["date1"]);
+    $where .= " AND date>='$date1'";
+    $get .= "&date1=$date1";
+}
+if (!empty($_REQUEST["date2"])) {
+    $date2 = htmlentities($_REQUEST["date2"]);
+    $where .= " AND date<='$date2'";
+    $get .= "&date2=$date2";
+}
+if (!empty($_REQUEST["store_id"])) {
+    $store_id = htmlentities($_REQUEST["store_id"]);
+    $where .= " AND store_id='$store_id'";
+    $get .= "&store_id=$store_id";
+}
 
 
-if(!empty($_REQUEST["type"]) and $_REQUEST["type"]!="-все-") {$type=htmlentities($_REQUEST["type"]);  $where .=" AND type='$type'"; $get .="&type=$type";}
+if (!empty($_REQUEST["type"]) and $_REQUEST["type"] != "-все-") {
+    $type = htmlentities($_REQUEST["type"]);
+    $where .= " AND type='$type'";
+    $get .= "&type=$type";
+}
 
-$stores=$db::mapping("SELECT id,name FROM products_1c WHERE tip='city_store' AND view='1' ");
-$products=$db::mapping("SELECT id,name FROM products_1c WHERE tip='products' ");
+$stores = $db::mapping("SELECT id,name FROM products_1c WHERE tip='city_store' AND view='1' ");
+$products = $db::mapping("SELECT id,name FROM products_1c WHERE tip='products' ");
 
-$stiresDostup="";
-$where .=" AND store_id in ('";
-$k=0;
-foreach( $stores as $guid => $store) {
-    if(in_array($guid,$_SESSION["store_arr_guid_dostup"])) {
-        if($k!=0) $where .="','";
-        $where .=$guid;
-        $stiresDostup .="<a href=\"/$modul/?store_id=$guid\" class=\"btn btn-";
-        if($guid==$store_id) $stiresDostup .="success";
-        else $stiresDostup .="info";
+$stiresDostup = "";
+$where .= " AND store_id in ('";
+$k = 0;
+foreach ($stores as $guid => $store) {
+    if (in_array($guid, $_SESSION["store_arr_guid_dostup"])) {
+        if ($k != 0) $where .= "','";
+        $where .= $guid;
+        $stiresDostup .= "<a href=\"/$modul/?store_id=$guid\" class=\"btn btn-";
+        if ($guid == $store_id) $stiresDostup .= "success";
+        else $stiresDostup .= "info";
 
-        $stiresDostup .=" mt-2 me-2 btn-sm\">".$store."</a>";
+        $stiresDostup .= " mt-2 me-2 btn-sm\">" . $store . "</a>";
 
         $k++;
     }
 }
-$where .="')";
+$where .= "')";
 
 
-echo"<div class=row><div class=\"col-12\">Доступные магазины $stiresDostup</div></div>";
+echo "<div class=row><div class=\"col-12\">Доступные магазины $stiresDostup</div></div>";
 
 $limit = 100;
-$offset = !empty($_GET['p'])?(($_GET['p']-1)*$limit):0;
-$offset=(int)$offset;
+$offset = !empty($_GET['p']) ? (($_GET['p'] - 1) * $limit) : 0;
+$offset = (int)$offset;
 //получаем количество записей
-$resultNum = $db::getRow("SELECT COUNT(*) as postNum FROM write_offs WHERE 1 $where",);
-$rowCount = $resultNum['postNum'];
+$resultNum = $db::run("SELECT COUNT(*) as postNum FROM write_offs WHERE 1 $where");
+$resultNum = $resultNum ? $resultNum->fetchAll() : false;
+$rowCount = isset($resultNum['postNum']) ? $resultNum['postNum'] : 0;
 //инициализируем класс pagination
-$pagConfig = array('baseURL'=>'/'.$modul.'/?'.$get.'',  'totalRows'=>$rowCount, 'perPage'=>$limit );
-$pagination =  new Pagination($pagConfig); //получаем записи
-
+$pagConfig = array('baseURL' => '/' . $modul . '/?' . $get . '', 'totalRows' => $rowCount, 'perPage' => $limit);
+$pagination = new Pagination($pagConfig); //получаем записи
 
 
-$select=array("-все-","Брак","Списание по инвентаризации","Брак с поставки","Списание на затраты (подарки)");
+$select = array("-все-", "Брак", "Списание по инвентаризации", "Брак с поставки", "Списание на затраты (подарки)");
 
-echo'<h1>Списания</h1>';
+echo '<h1>Списания</h1>';
 
 
-echo'<form method=post>
+echo '<form method=post>
 <input type="hidden" name="_csrf" value="' . Yii::$app->request->getCsrfToken() . '" />
-<table><td><input type=date name=date1 value="'.$date1.'" class="form-control"></td>
-<td><input type=date name=date2 value="'.$date2.'" class="form-control"> </td>
+<table><td><input type=date name=date1 value="' . $date1 . '" class="form-control"></td>
+<td><input type=date name=date2 value="' . $date2 . '" class="form-control"> </td>
 <td><select class="form-control" name="type">';
-foreach($select as $name) {
-    echo'<option value="'.$name.'" ';
-    if($name==$type) echo' selected';
-    echo' >'.$name.'</option>';
+foreach ($select as $name) {
+    echo '<option value="' . $name . '" ';
+    if ($name == $type) echo ' selected';
+    echo ' >' . $name . '</option>';
 }
-echo'</select></td><td><button class="btn btn-success" value="1" name=show>сохранить</button></td></table></form>';
+echo '</select></td><td><button class="btn btn-success" value="1" name=show>сохранить</button></td></table></form>';
 
-echo'<div class="e-table"><div class="table-responsive table-lg mt-3">
+echo '<div class="e-table"><div class="table-responsive table-lg mt-3">
 <table class="table table-bordered border-top text-nowrap">
 <thead><tr><th class="border-bottom-0" width=100>сумма закупочные</th>
 <th class="border-bottom-0" width=100>сумма в розничных</th>
@@ -78,48 +95,49 @@ echo'<div class="e-table"><div class="table-responsive table-lg mt-3">
 <th class="border-bottom-0 w-10">магазин дата</th><th class="border-bottom-0 w-80">наименование</th>
 
 </tr></thead><tbody>';
-$summ_retail=0;
-$data=$db::getRows("SELECT *,DATE_FORMAT(date, '%d.%m.%Y %H:%i') as date2 FROM write_offs WHERE 1 $where order by date  DESC LIMIT $offset,$limit");
-foreach($data as $row) {
+$summ_retail = 0;
+$data = $db::run("SELECT *,DATE_FORMAT(date, '%d.%m.%Y %H:%i') as date2 FROM write_offs WHERE 1 $where order by date  DESC LIMIT $offset,$limit");
+$data = $data ? $data->fetchAll() : false;
+foreach (is_array($data) ? $data : [] as $row) {
 
 
-    $items=json_decode($row["items"],true,512,JSON_UNESCAPED_UNICODE);
+    $items = json_decode($row["items"], true, 512, JSON_UNESCAPED_UNICODE);
 
-    echo'<tr onclick="$(\'#dd__'.$row["id"].'\').toggle();">
-<td>'.$row["summ"].'</td><td>'.$row["summ_retail"].'</td><td>'.$row["write_downs"].'</td><td>';
+    echo '<tr onclick="$(\'#dd__' . $row["id"] . '\').toggle();">
+<td>' . $row["summ"] . '</td><td>' . $row["summ_retail"] . '</td><td>' . $row["write_downs"] . '</td><td>';
 
 
-    $summ_retail +=$row["summ_retail"];
-    $summ +=$row["summ"];
+    $summ_retail += $row["summ_retail"];
+    $summ += $row["summ"];
 
-    if(empty($store_id)) echo'<span class="tag m-1">'.$stores[$row["store_id"]].'</span> ';
+    if (empty($store_id)) echo '<span class="tag m-1">' . $stores[$row["store_id"]] . '</span> ';
 
-    echo'
+    echo '
 
-<a href="/'.$modul.'/comments/?write_offs_id='.$row["id"].'" class="btn btn-info">комментарии</a> 
-'.$row["date2"].' '.$row["type"].'</td>
-<td><a href=/'.$modul.'/show/?id='.$row["id"].'>'.$row["number"].' '.$row["based_on"].' '.$row["comment"].'</a>
+<a href="/' . $modul . '/comments/?write_offs_id=' . $row["id"] . '" class="btn btn-info">комментарии</a>
+' . $row["date2"] . ' ' . $row["type"] . '</td>
+<td><a href=/' . $modul . '/show/?id=' . $row["id"] . '>' . $row["number"] . ' ' . $row["based_on"] . ' ' . $row["comment"] . '</a>
 ';
-    echo'</td></tr>';
+    echo '</td></tr>';
 
-    echo'<tr id="dd__'.$row["id"].'" style="display:none;"><td colspan=5>';
+    echo '<tr id="dd__' . $row["id"] . '" style="display:none;"><td colspan=5>';
 
-    echo'<table class="table table-hover table-sm"><thead><th>Наименование</th><th>количество списаного</th><th>сумма</th></thead><tbody>';
+    echo '<table class="table table-hover table-sm"><thead><th>Наименование</th><th>количество списаного</th><th>сумма</th></thead><tbody>';
     rsort($items);
-    foreach($items as $k => $mass) {
+    foreach ($items as $k => $mass) {
 //.[product_id] => 7c73baa8-de69-11e8-96c5-1c6f659fb563 [color] => [quantity] => 10 [price] => 150 [summ] => 1500
-        echo'<tr><td>'.$products[$mass["product_id"]].'</td><td>'.$mass["quantity"].'</td><td>'.$mass["summ"].'</td></tr>';
+        echo '<tr><td>' . $products[$mass["product_id"]] . '</td><td>' . $mass["quantity"] . '</td><td>' . $mass["summ"] . '</td></tr>';
     }
-    echo'</tbody></table>';
-    echo'</td></tr>';
+    echo '</tbody></table>';
+    echo '</td></tr>';
 
 }
-echo'</tbody></table>';
+echo '</tbody></table>';
 
-echo'Итого в розничных <b>'.$summ_retail.'</b>  Итого в закупке <b>'.$summ.'</b>';
+echo 'Итого в розничных <b>' . $summ_retail . '</b>  Итого в закупке <b>' . $summ . '</b>';
 
-echo'</div></div>';
+echo '</div></div>';
 
-if(!empty($data)) echo $pagination->createLinks();
+if (!empty($data)) echo $pagination->createLinks();
 
 include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';