diff --git a/app/api/apiclient.php b/app/api/apiclient.php index 28a3961..7e61895 100644 --- a/app/api/apiclient.php +++ b/app/api/apiclient.php @@ -113,8 +113,10 @@ function client_status_sub($client_id, $client_group = 3){ } $findsql = "SELECT number_id FROM `anbuy` WHERE `client_id` = '$client_id' AND `number_id` = '486' AND `buy_status` = '1' LIMIT 1"; - + // echo $findsql; $findsub = db_get($findsql); + + //print_r($findsub); if (isset($findsub['number_id'])){ return True; diff --git a/app/routes/order.php b/app/routes/order.php index 511bd51..78935c9 100644 --- a/app/routes/order.php +++ b/app/routes/order.php @@ -48,7 +48,7 @@ function checkout_kuri($priceslug, $delivery_id = 1){ } else { $price = $price_id['offline_price']; // бумажный прайс - $delivery = delivery_list(); // список доставок для бумажной версии + $delivery = delivery_list($price_id['weight']); // список доставок для бумажной версии } @@ -308,17 +308,26 @@ function status_kuri($order_id){ } -function delivery_list() { +function delivery_list($weight = 250) { $result = []; $delivery = db_get("SELECT * FROM delivery WHERE delivery_id > 1"); foreach ($delivery as $del){ - + $key = $del['delivery_id']; $result[$key] = $del; + if ($del['delivery_id'] == 4){ + if ($weight > 250){ + $result[$key]['delivery_price'] = 450; + } + + } + + + } return $result; diff --git a/app/routes/pdfserver.php b/app/routes/pdfserver.php index 4473392..4357d4d 100644 --- a/app/routes/pdfserver.php +++ b/app/routes/pdfserver.php @@ -50,6 +50,7 @@ function pdfs_init($source, $page = 1){ $name = pdfs_hash($source); $cachedir = PGDIR.$name.'/'; + //echo $cachedir; $cachefile = $name.'-'.$page.'.pdf'; $fullcachefile = $cachedir.$cachefile; diff --git a/app/views/checkout.phtml b/app/views/checkout.phtml index e16aac4..cfe1624 100644 --- a/app/views/checkout.phtml +++ b/app/views/checkout.phtml @@ -71,8 +71,9 @@

*Куда придет информация о заказе

">

- + 1):?> +


" type="text">

diff --git a/scripts/push_mail.sh b/scripts/push_mail.sh index b394ffe..3065710 100644 --- a/scripts/push_mail.sh +++ b/scripts/push_mail.sh @@ -3,4 +3,4 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/root PATH=$PATH:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin -docker exec ds_fpm php /thosts/anpdf/app/index.php sendstatus \ No newline at end of file +docker exec arlemp_pdftk_1 php /vhosts/anpdf/app/index.php sendstatus