From: Alexander Smirnov Date: Wed, 24 Apr 2024 15:46:02 +0000 (+0300) Subject: add bonus/bonus-users X-Git-Tag: 1.1~105^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=d197c9306183777213af656bfab0d6ec8c26df8e;p=erp24_rep%2Fyii-erp24%2F.git add bonus/bonus-users --- diff --git a/erp24/controllers/BonusController.php b/erp24/controllers/BonusController.php index 6dea2810..f5c8b873 100644 --- a/erp24/controllers/BonusController.php +++ b/erp24/controllers/BonusController.php @@ -10,12 +10,16 @@ class BonusController extends \yii\web\Controller 'stat' => \yii_app\actions\bonus\StatAction::class, 'vozvrat-stats' => \yii_app\actions\bonus\VozvratStatsAction::class, 'ajax-show-check' => \yii_app\actions\bonus\AjaxShowCheckAction::class, - 'users' => \yii_app\actions\bonus\UsersAction::class, - 'ajax-bonus-history' => \yii_app\actions\bonus\AjaxBonusHistoryAction::class, - 'ajax-user-add-stop-list' => \yii_app\actions\bonus\AjaxUserAddStopListAction::class, - 'ajax-user-remove-stop-list' => \yii_app\actions\bonus\AjaxUserRemoveStopListAction::class, +// 'users' => \yii_app\actions\bonus\UsersAction::class, +// 'ajax-bonus-history' => \yii_app\actions\bonus\AjaxBonusHistoryAction::class, +// 'ajax-user-add-stop-list' => \yii_app\actions\bonus\AjaxUserAddStopListAction::class, +// 'ajax-user-remove-stop-list' => \yii_app\actions\bonus\AjaxUserRemoveStopListAction::class, 'ajax-bonus-remove' => \yii_app\actions\bonus\AjaxBonusRemoveAction::class, 'sex' => \yii_app\actions\bonus\SexAction::class, ]; } + public function actionBonusUsers() { return $this->render('bonus-users'); } + public function actionAjaxBonusHistory() { return $this->renderPartial('ajax-bonus-history'); } + public function actionAjaxUserAddStopList() { return $this->renderPartial('ajax-user-add-stop-list'); } + public function actionAjaxUserRemoveStopList() { return $this->renderPartial('ajax-user-remove-stop-list'); } } \ No newline at end of file diff --git a/erp24/modul/bonus/ajax_bonus_history.php b/erp24/modul/bonus/ajax_bonus_history.php index 4d431efa..766a3f69 100644 --- a/erp24/modul/bonus/ajax_bonus_history.php +++ b/erp24/modul/bonus/ajax_bonus_history.php @@ -1,9 +1,10 @@ -Добавить клиента в бонусную"; -$data = $db::getRows("SELECT id,tip, tip_sale, store_id,bonus,date, name,admin_id, check_id, DATE_FORMAT(date,'%d.%m.%Y в %H:%i') as date_h, -DATE_FORMAT(date_end,'%d.%m.%Y') as date_end, price,price_skidka +$data = $db::getRows("SELECT id,tip, tip_sale, store_id,bonus,date, name,admin_id, check_id, TO_CHAR(date,'DD.MM.YYYY в HH:MM') as date_h, +TO_CHAR(date_end,'DD.MM.YYYY') as date_end, price,price_skidka FROM users_bonus WHERE phone=? order by date DESC",[$phone]); echo""; +$minus = 0; foreach ($data as $row) { -if($row["tip"]=="plus") {$tip="+"; $store_arr_bonus[$row["store_id"]]["plus"]=$store_arr_bonus[$row["store_id"]]["plus"]+$row["bonus"];} -else { $tip="-"; $minus=$minus+$row["bonus"]; $store_arr_bonus[$row["store_id"]]["minus"]=$store_arr_bonus[$row["store_id"]]["minus"]+$row["bonus"]; } +if($row["tip"]=="plus") {$tip="+"; $store_arr_bonus[$row["store_id"]]["plus"]=($store_arr_bonus[$row["store_id"]]["plus"]??0)+$row["bonus"];} +else { $tip="-"; $minus=$minus+$row["bonus"]; $store_arr_bonus[$row["store_id"]]["minus"]=($store_arr_bonus[$row["store_id"]]["minus"]??0)+$row["bonus"]; } echo'$val) { $search[$pole]=$val; @@ -72,20 +72,21 @@ if(!empty($_REQUEST["asc_desc"])) $asc_desc=htmlentities($_REQUEST["asc_desc"]) -$where .="order by $sort_by $asc_desc"; // получаем кол-во записей -$resultNum = $db::getRow("SELECT COUNT(*) as postNum FROM users WHERE 1 $where ",$binding); //'%'.$name.'%' -$rowCount = $resultNum['postNum']; +$sql = "SELECT COUNT(*) as postnum FROM users WHERE 1 = 1 $where "; +$resultNum = $db::getRow($sql,$binding); //'%'.$name.'%' +$rowCount = $resultNum['postnum']; $limit = 100; $offset = !empty($_GET['p'])?(($_GET['p']-1)*$limit):0; $offset=(int)$offset; +$where .="order by $sort_by $asc_desc"; echo $where; -$data = $db::getRows("SELECT *,DATE_FORMAT(bdate,'%d.%m.%Y') as bdate2,DATE_FORMAT(date,'%d.%m.%Y %H:%i') as date2 FROM users WHERE 1 $where LIMIT $offset,$limit",$binding); - +$sql = "SELECT *,TO_CHAR(bdate,'DD.MM.YYYY') as bdate2, TO_CHAR(date,'DD.MM.YYYY HH:MM') as date2 FROM users WHERE 1=1 $where LIMIT $limit OFFSET $offset"; +$data = $db::getRows($sql, $binding); echo"

Клиенты в программе лояльности

"; // $where ".print_r($binding)." //пагинация @@ -102,10 +103,10 @@ if(!empty($data)) { } -echo"
бонусыдатамагазин, сотрудникнаименованиедата сгорания
-
дата добавленияКлиент
+echo"
" . '' . " + @@ -169,9 +170,13 @@ echo'">даты клиента -
дата добавленияКлиент
-		Телефон
+		Телефон
продаж Даты клиента'; if($row["bdate"]!='0000-00-00') { $barr=explode("-",$row["bdate"]); -echo ''.$barr[2].'.'.$barr[1].'.'.$barr[0].''; -$vozrast=date("Y")-$barr[0]; -echo'('.$vozrast.')'; + if (!empty($barr)) { + echo '' . ($barr[2] ?? '') . '.' . ($barr[1] ?? '') . '.' . ($barr[0] ?? '') . ''; + if (!empty($barr[0])) { + $vozrast = date("Y") - (int)($barr[0] ?? 0); + echo '(' . $vozrast . ')'; + } + } } @@ -180,7 +185,7 @@ echo' '.$row["balans"].' '.$balans.''.$row["bonus_minus"].' '.$row["referal_id"].' + '.($row["referal_id"] ?? '').' Сума продажи '.$row["sale_price"].' '; @@ -212,23 +217,26 @@ $_CONFIG["jscss"]="