From: Alexander Smirnov Date: Thu, 21 Dec 2023 10:14:22 +0000 (+0300) Subject: add bonus/vozvrat-stats during moving from pure php to yii X-Git-Tag: 1.1~197^2~2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1fa8659d34b7f283839cc06f4d47241585b27055;p=erp24_rep%2Fyii-erp24%2F.git add bonus/vozvrat-stats during moving from pure php to yii --- diff --git a/erp24/actions/bonus/AjaxShowCheckAction.php b/erp24/actions/bonus/AjaxShowCheckAction.php new file mode 100644 index 00000000..f33f5c8d --- /dev/null +++ b/erp24/actions/bonus/AjaxShowCheckAction.php @@ -0,0 +1,12 @@ +controller->renderPartial('ajax-show-check'); + } +} \ No newline at end of file diff --git a/erp24/actions/bonus/VozvratStatsAction.php b/erp24/actions/bonus/VozvratStatsAction.php new file mode 100644 index 00000000..f2274308 --- /dev/null +++ b/erp24/actions/bonus/VozvratStatsAction.php @@ -0,0 +1,12 @@ +controller->render('vozvrat-stats'); + } +} \ No newline at end of file diff --git a/erp24/controllers/BonusController.php b/erp24/controllers/BonusController.php index 226735a4..1e58eb1c 100644 --- a/erp24/controllers/BonusController.php +++ b/erp24/controllers/BonusController.php @@ -4,12 +4,12 @@ namespace app\controllers; class BonusController extends \yii\web\Controller { - public function actions() { return [ 'stat' => \yii_app\actions\bonus\StatAction::class, + 'vozvrat-stats' => \yii_app\actions\bonus\VozvratStatsAction::class, + 'ajax-show-check' => \yii_app\actions\bonus\AjaxShowCheckAction::class, ]; } - -} +} \ No newline at end of file diff --git a/erp24/views/bonus/ajax-show-check.php b/erp24/views/bonus/ajax-show-check.php new file mode 100644 index 00000000..964c20fc --- /dev/null +++ b/erp24/views/bonus/ajax-show-check.php @@ -0,0 +1,91 @@ + '.$data["operation"].' Сумма'.$data["summ"].' Номер чека '.$data["number"].' + +

'; + + if(!empty($data["phone"])) + echo'Клиент +Искать в бонусной '.$data["phone"].''; + + + echo'Дата '.$data["date"].'
'; +// id: '.$id.' + $paym=json_decode($data["payments"],true); + $nal=0; + $paym_txt=''; + foreach($paym as $kl =>$arrr) { + if($arrr["type"]=="Наличные") $nal=1; + $paym_txt .='1) Тип: '.$arrr["type"].' '.$arrr["terminal"].' Сумма:'.$arrr["summ"].'
'; + } + + + echo'

'.$paym_txt.'
'; + + + + + if(!empty($data_v)) { + $paym=json_decode($data_v["payments"],true); + $nal=0; + $paym_txt=''; + foreach($paym as $kl =>$arrr) { + if($arrr["type"]=="Наличные") $nal=1; + $paym_txt .='1) Тип: '.$arrr["type"].' '.$arrr["terminal"].' Сумма:'.$arrr["summ"].'
'; + } + + echo'
По этому чеку был возврат
+Дата: '.$data_v["date"].'
'.$paym_txt.'
'; + + } + + + $data_v = $db::getRow("SELECT * FROM sales WHERE sales_check=?",[$id]); + if(!empty($data_v)) { + $paym=json_decode($data_v["payments"],true); + $nal=0; + $paym_txt=''; + foreach($paym as $kl =>$arrr) { + if($arrr["type"]=="Наличные") $nal=1; + $paym_txt .='1) Тип: '.$arrr["type"].' '.$arrr["terminal"].' Сумма:'.$arrr["summ"].'
'; + } + + echo'
По этому чеку был возврат
Дата: '.$data_v["date"].'
'.$paym_txt.'
'; + + } + + + + $data = $db::getRows("SELECT p.name, i.kol, i.summa, i.id_1c FROM sales_items as i RIGHT JOIN products_1c as p ON p.id=i.id_1c WHERE i.check_id=?",[$id]); + echo'
+ +'; + foreach($data as $row) { + $itogo=$itogo+$row["summa"]; + echo ' '; + } + echo'
Наименованиекол-восумма
'.$row["name"].''.$row["kol"].''.$row["summa"].'
'; + + echo 'Итого: '.$itogo; + + +} + + diff --git a/erp24/views/bonus/vozvrat-stats.php b/erp24/views/bonus/vozvrat-stats.php new file mode 100644 index 00000000..28e6c6df --- /dev/null +++ b/erp24/views/bonus/vozvrat-stats.php @@ -0,0 +1,130 @@ +='$date1 00:00:00' AND date<='$date2 23:59:59'"; + +if(!empty($_REQUEST["store_id"]) and $_REQUEST["store_id"]!="-1") { + $store_id=intval($_REQUEST["store_id"]); $where .=" AND store_id='$store_id'";} + + + +echo"$where
+request->getCsrfToken() . "\" /> + + + + + + + +
+ + + +
"; + + + + + +$data = $db::getRows("SELECT *, DATE_FORMAT(date,'%d.%m.%Y в %H:%i:%s') as date_t FROM +sales WHERE operation='Возврат' $where order by date desc"); + +echo'
+'; +foreach ($data as $row) { + $paym=json_decode($row["payments"],true); + $nal=0; + $paym_txt=''; + foreach($paym as $kl =>$arrr) { + if($arrr["type"]=="Наличные") $nal=1; + $paym_txt .='1) Тип: '.$arrr["type"].' '.$arrr["terminal"].' Сумма:'.$arrr["summ"].'
'; + } + + echo' +'; + +} +echo'
'.$row["date_t"].''.$row["summ"].''.$row["status"].' +просмотр '.$row["number"].' + +'.$store_arr[$row["store_id"]].' '; + + + + + echo''.$paym_txt.''.$row["phone"].'
'; + + + + +$_CONFIG["jscss"]=""; + + +echo' + + +'; + + + + +include_once dirname(__DIR__, 2) . '/templates/bottom_light.php';