-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
-include_once("inc/shipment.php");
-include_once("templates/top.php");
+<?php
+include_once(dirname(__DIR__, 2) . "/startup.php");
+include_once(dirname(__DIR__, 2) . "/inc/db.php");
+include_once(dirname(__DIR__, 2) . "/inc/base_new.php");
+include_once(dirname(__DIR__, 2) . "/inc/shipment.php");
+
$modul="shipment";
-error_reporting(E_ALL ^ E_NOTICE);
+
//$providers=$db::mapping("SELECT id,name FROM shipment_providers ");
$citiesAll=$db::mapping("SELECT id,name FROM universal_catalog_item WHERE catalog_alias='cities'");
-$data=$db::getRows("SELECT *, DATE_FORMAT(date_add,'%d.%m.%Y') as date_add, DATE_FORMAT(date_start,'%d.%m.%Y') as date_start
-FROM store_orders WHERE parent_id!=0 AND date_start>=NOW() - INTERVAL 70 DAY order by delivery_date DESC LIMIT 430");
+$data=$db::getRows("SELECT *, TO_CHAR(date_add,'DD.MM.YYYY') as date_add, TO_CHAR(date_start,'DD.MM.YYYY') as date_start
+FROM store_orders WHERE parent_id!=0 AND date_start>=NOW() - INTERVAL '70 DAY' order by delivery_date DESC LIMIT 430");
foreach($data as $row) $dozakupka[$row["parent_id"]][]=$row;
-$data=$db::getRows("SELECT *, DATE_FORMAT(date_add,'%d.%m.%Y') as date_add, DATE_FORMAT(date_start,'%d.%m.%Y') as date_start
-FROM store_orders WHERE parent_id=0 AND date_start>=NOW() - INTERVAL 70 DAY order by delivery_date DESC LIMIT 30");
+$data=$db::getRows("SELECT *, TO_CHAR(date_add,'DD.MM.YYYY') as date_add, TO_CHAR(date_start,'DD.MM.YYYY') as date_start
+FROM store_orders WHERE parent_id=0 AND date_start>=NOW() - INTERVAL '70 DAY' order by delivery_date DESC LIMIT 30");
foreach($data as $row) {
$in=explode(",",$row["providers_arr"]);
// bg-'.$store_orders_statusesbg[$row["status"]].' $(\'#tr___'.$row["id"].'\').show();
-if($dozakupka[$row["id"]])
+if($dozakupka[$row["id"]] ?? false)
echo'<span class="btn btn-light me-1" onclick="$(\'#external__'.$row["id"].'\').toggle();">показать дозакупки ('.count($dozakupka[$row["id"]]).')</span>';
echo'<a href=/'.$modul.'/shipment/?id='.$row["id"].' class="btn btn-default fs-6">
if($row["status"]>=6) echo'<a class="dropdown-item" href=/shipment/divisionStore/?id='.$row["id"].'>деление - на основе заказа магазина <sup class="btn btn-sm btn-success">new</sup></a>
-<a class="dropdown-item" href=/shipment/divisionStorePrint/?id='.$row["id"].'>Печать деления для кладовщика <sup class="btn btn-sm btn-success">new</sup></a>';
+<a class="dropdown-item" href=/shipment/divisionStorePrint/?id='.$row["id"].'>Печать деления для кладовщика <sup class="btn btn-sm btn-success">new</sup></a>
+<a class="dropdown-item" href=/shipment/divisionStorePrint/?id='.$row["id"].'&colors=false>Печать деления для кладовщика без цветов<sup class="btn btn-sm btn-success">new</sup></a>
+
+';
if(in_array($_SESSION["group_id"],[1,70,10])) {
echo'<a class="dropdown-item" href=/shipment/divisionClone/?id='.$row["id"].'>копировать закупку для частичной поставки <sup class="btn btn-sm btn-success">new</sup></a>';
echo'</div> </div>
<span class="btn btn-warning btn-sm me-2">'.$store_orders_statuses[$row["status"]].'</span>
-<small>дата продаж: '.$row["date_start"].', создано:'.$row["date_add"].' <i>'.$row["comment"].'</i></small>
+<small>дата продаж: '.$row["date_start"].', создано:'.$row["date_add"].' <i>'.($row["comment"] ?? '').'</i></small>
</div>
<div class="expanel-body" id="external__'.$row["id"].'" style="display:none;"> ';
//echo 'sales_cnt='.$data_values["sales_cnt"].' sales_amount='.$data_values["sales_amount"].' '; bg-'.$store_orders_statusesbg[$rows["status"]].'
echo'<div class="row">';
-if (isset($dozakupka[$row["id"]]))
-foreach($dozakupka[$row["id"]] as $rows) {
+foreach($dozakupka[$row["id"]] ?? [] as $rows) {
echo'<div class="col-12">
<div class="ml-4">';
if($rows["status"]>=6)
echo'<a class="dropdown-item" href=/shipment/divisionStore/?id='.$rows["id"].'>деление - на основе заказа магазина <sup class="btn btn-sm btn-success">new</sup></a>
-<a class="dropdown-item" href=/shipment/divisionStorePrint/?id='.$row["id"].'>Печать деления для кладовщика <sup class="btn btn-sm btn-success">new</sup></a>';
+<a class="dropdown-item" href=/shipment/divisionStorePrint/?id='.$rows["id"].'>Печать деления для кладовщика <sup class="btn btn-sm btn-success">new</sup></a>
+<a class="dropdown-item" href=/shipment/divisionStorePrint/?id='.$rows["id"].'&colors=false>Печать деления для кладовщика без цветов<sup class="btn btn-sm btn-success">new</sup></a>
+
+';
if(in_array($_SESSION["group_id"],[1,70,10])) {
- echo'<a class="dropdown-item" href=/shipment/divisionClone/?id='.$row["id"].'>копировать закупку для частичной поставки <sup class="btn btn-sm btn-success">new</sup></a>';
+ echo'<a class="dropdown-item" href=/shipment/divisionClone/?id='.$rows["id"].'>копировать закупку для частичной поставки <sup class="btn btn-sm btn-success">new</sup></a>';
}
-if($row["status"]>=6) echo'
-<a class="dropdown-item" href=/shipment/storeOrderScore/?id='.$row["id"].'>Оценка качества цветка в поставке <sup class="btn btn-sm btn-success">new</sup></a>';
+if($rows["status"]>=6) echo'
+<a class="dropdown-item" href=/shipment/storeOrderScore/?id='.$rows["id"].'>Оценка качества цветка в поставке <sup class="btn btn-sm btn-success">new</sup></a>';
echo'</div> </div>
-<i>'.$rows["comment"].'</i>';
+<i>'.($rows["comment"]??'').'</i>';
//printStoreOrderFiles($rows["id"]);
echo'</div></div>';
}
}
-$_CONFIG["jscss"] .='<style>
+$_CONFIG["jscss"] ='<style>
table.zakupka{ margin:0 0 0.2rem 0; border:1px #cdcdcd solid;}
table.zakupka tbody td{ padding:0.2rem;}
table.zakupka tbody td big{ font-weight:bolder; font-size:1.3rem;}
table.zakupka td a:hover{text-decoration:underline;}</style>';
-
-include"templates/bottom.php";
+
+include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';
<?php
+chdir(__DIR__ . '/../../');
-use yii\grid\ActionColumn;
-use yii\helpers\Url;
-use yii\helpers\Html;
-use yii\grid\GridView;
-use yii\widgets\Pjax;
-use yii_app\records\Dashboard;
-
-/* @var $this yii\web\View */
-/* @var $bonusConversionCost int */
-
-/* @var $userSalarySalut float */
-/* @var $userSalarySalutPremium float */
-/* @var $storeOrders array */
-/* @var $dozakupka array */
-/* @var $store_orders_statuses array */
-
-$this->title = 'Список закупок';
-$this->params['breadcrumbs'][] = $this->title;
-$modul = 'shipments';
-
-?>
-
-
-<div class="dashboard-index">
-
- <h1><?= Html::encode($this->title) ?></h1>
-
-
- <p>
- <?= Html::a('Создать', ['create'], ['class' => 'btn btn-success']) ?>
- </p>
-
-
-
-</div>
-<?php
-
-foreach($storeOrders as $row) {
- ?>
- <div class="expanel expanel-default">
- <div class="expanel-heading">
-
- <span class="btn btn-white btn-light me-1" onclick="$('#external__<?php echo $row["id"]?>').toggle();">показать дозакупки</span>
- <a href=/<?php echo $modul?>/fields-data/?id=<?php echo $row["id"]?> class="btn btn-default fs-5">
- <span class="btn btn-outline-info"><?php echo $row["id"]?></span> <?php echo $row["name"]?></a>
-
-
- <div class="d-inline-block dropdown me-2">
- <button type="button" class="btn bg-dark-transparent dropdown-toggle" onclick="$(this).parent().children('.dropdown-menu').toggle();">действия</button>
- <div class="dropdown-menu" style="display:none;">
- <a class="dropdown-item" href="/shipment/add/?id=<?php echo $row["id"]?>">правка</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/view/?id=<?php echo $row["id"]?>>старый интерфейс</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/view2/?id=<?php echo $row["id"]?>>новый интерфейс</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/fields-data/?id=<?php echo $row["id"]?> >новый интерфейс2</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/division/?id=<?php echo $row["id"]?>>деление</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/purchase/?id=<?php echo $row["id"]?>>цвета для кустовых при заказе</a>
-
- <a class="dropdown-item" href=/<?php echo $modul?>/divisionPrint/?id=<?php echo $row["id"]?>>деление - печать на складе</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/divisionPrintEdit/?id=<?php echo $row["id"]?>>деление - по цветам</a>
- </div>
- </div>
-
- <a href="/shipment/edit/?id=<?php echo $row["id"]?>" class="btn btn-warning btn-sm me-2"><?php echo $store_orders_statuses[$row["status"]]?></a>
- <small>дата продаж: <?php echo $row["date_start"]?>, создано <?php echo $row["date_add"]?> <i><?php echo $row["comments"]?></i></small>
-
-
-
-
- </div>
-
- <div class="expanel-body" id="external__<?php echo $row["id"] ?>" style="display:none;">
- <div class="row">
- <?php
- if (array_key_exists($row["id"], $dozakupka)) {
- foreach($dozakupka[$row["id"]] as $rows) {
-
- ?>
- <div class="col-12">
- <div class="ml-4">
- <a href=/<?php echo $modul?>/fields-data/?id=<?php echo $rows["id"]?> class="btn btn-white fs-6 me-3">
- <span class="btn btn-outline-info fs-6 me-2"><?php echo $rows["id"]?></span><?php echo $rows["name"]?>
- <span class="me-2 btn btn-sm bg-warning"><?php echo $store_orders_statuses[$rows["status"]]?></span>
- </a>
- <div class="dropdown d-inline-block">
- <button type="button" class="btn bg-dark-transparent dropdown-toggle" onclick="$(this).parent().children('.dropdown-menu').toggle();">действия </button>
- <div class="dropdown-menu" style="">
- <a class="dropdown-item" href="/shipment/add/?id=<?php echo $rows["id"]?>">правка</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/view/?id=<?php echo $rows["id"]?>>старый интерфейс</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/view2/?id=<?php echo $rows["id"]?>>новый интерфейс</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/fields-data/?id=<?php echo $rows["id"]?> >новый интерфейс2</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/division/?id=<?php echo $rows["id"]?>>деление</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/purchase/?id=<?php echo $rows["id"]?>>цвета для кустовых при заказе</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/divisionPrint/?id=<?php echo $rows["id"]?>>деление - печать на складе</a>
- <a class="dropdown-item" href=/<?php echo $modul?>/divisionPrintEdit/?id=<?php echo $rows["id"]?>>деление - по цветам</a>
- </div>
- </div>
- <i><?php echo $rows["comment"] ?? ''?></i>
- <table class="table"><tbody></tbody></table>
- </div>
- </div>
- <?php
- }
- }
- ?>
-
- </div>
- </div>
-
-
- </div>
-
-
-
-
-
-<?php
-}
+include 'modul/shipment/index.php';
\ No newline at end of file
--- /dev/null
+<?php
+
+
+use yii\grid\ActionColumn;
+use yii\helpers\Url;
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\widgets\Pjax;
+use yii_app\records\Dashboard;
+
+/* @var $this yii\web\View */
+/* @var $bonusConversionCost int */
+
+/* @var $userSalarySalut float */
+/* @var $userSalarySalutPremium float */
+/* @var $storeOrders array */
+/* @var $dozakupka array */
+/* @var $store_orders_statuses array */
+
+$this->title = 'Список закупок';
+$this->params['breadcrumbs'][] = $this->title;
+$modul = 'shipments';
+
+?>
+
+
+<div class="dashboard-index">
+
+ <h1><?= Html::encode($this->title) ?></h1>
+
+
+ <p>
+ <?= Html::a('Создать', ['create'], ['class' => 'btn btn-success']) ?>
+ </p>
+
+
+
+</div>
+<?php
+
+foreach($storeOrders as $row) {
+ ?>
+ <div class="expanel expanel-default">
+ <div class="expanel-heading">
+
+ <span class="btn btn-white btn-light me-1" onclick="$('#external__<?php echo $row["id"]?>').toggle();">показать дозакупки</span>
+ <a href=/<?php echo $modul?>/fields-data/?id=<?php echo $row["id"]?> class="btn btn-default fs-5">
+ <span class="btn btn-outline-info"><?php echo $row["id"]?></span> <?php echo $row["name"]?></a>
+
+
+ <div class="d-inline-block dropdown me-2">
+ <button type="button" class="btn bg-dark-transparent dropdown-toggle" onclick="$(this).parent().children('.dropdown-menu').toggle();">действия</button>
+ <div class="dropdown-menu" style="display:none;">
+ <a class="dropdown-item" href="/shipment/add/?id=<?php echo $row["id"]?>">правка</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/view/?id=<?php echo $row["id"]?>>старый интерфейс</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/view2/?id=<?php echo $row["id"]?>>новый интерфейс</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/fields-data/?id=<?php echo $row["id"]?> >новый интерфейс2</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/division/?id=<?php echo $row["id"]?>>деление</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/purchase/?id=<?php echo $row["id"]?>>цвета для кустовых при заказе</a>
+
+ <a class="dropdown-item" href=/<?php echo $modul?>/divisionPrint/?id=<?php echo $row["id"]?>>деление - печать на складе</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/divisionPrintEdit/?id=<?php echo $row["id"]?>>деление - по цветам</a>
+ </div>
+ </div>
+
+ <a href="/shipment/edit/?id=<?php echo $row["id"]?>" class="btn btn-warning btn-sm me-2"><?php echo $store_orders_statuses[$row["status"]]?></a>
+ <small>дата продаж: <?php echo $row["date_start"]?>, создано <?php echo $row["date_add"]?> <i><?php echo $row["comments"]?></i></small>
+
+
+
+
+ </div>
+
+ <div class="expanel-body" id="external__<?php echo $row["id"] ?>" style="display:none;">
+ <div class="row">
+ <?php
+ if (array_key_exists($row["id"], $dozakupka)) {
+ foreach($dozakupka[$row["id"]] as $rows) {
+
+ ?>
+ <div class="col-12">
+ <div class="ml-4">
+ <a href=/<?php echo $modul?>/fields-data/?id=<?php echo $rows["id"]?> class="btn btn-white fs-6 me-3">
+ <span class="btn btn-outline-info fs-6 me-2"><?php echo $rows["id"]?></span><?php echo $rows["name"]?>
+ <span class="me-2 btn btn-sm bg-warning"><?php echo $store_orders_statuses[$rows["status"]]?></span>
+ </a>
+ <div class="dropdown d-inline-block">
+ <button type="button" class="btn bg-dark-transparent dropdown-toggle" onclick="$(this).parent().children('.dropdown-menu').toggle();">действия </button>
+ <div class="dropdown-menu" style="">
+ <a class="dropdown-item" href="/shipment/add/?id=<?php echo $rows["id"]?>">правка</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/view/?id=<?php echo $rows["id"]?>>старый интерфейс</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/view2/?id=<?php echo $rows["id"]?>>новый интерфейс</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/fields-data/?id=<?php echo $rows["id"]?> >новый интерфейс2</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/division/?id=<?php echo $rows["id"]?>>деление</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/purchase/?id=<?php echo $rows["id"]?>>цвета для кустовых при заказе</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/divisionPrint/?id=<?php echo $rows["id"]?>>деление - печать на складе</a>
+ <a class="dropdown-item" href=/<?php echo $modul?>/divisionPrintEdit/?id=<?php echo $rows["id"]?>>деление - по цветам</a>
+ </div>
+ </div>
+ <i><?php echo $rows["comment"] ?? ''?></i>
+ <table class="table"><tbody></tbody></table>
+ </div>
+ </div>
+ <?php
+ }
+ }
+ ?>
+
+ </div>
+ </div>
+
+
+ </div>
+
+
+
+
+
+<?php
+}
projects / erp24_rep / yii-erp24 / .git / commitdiff