diff --git a/src/app/cli.php b/src/app/cli.php new file mode 100644 index 0000000..4d62913 --- /dev/null +++ b/src/app/cli.php @@ -0,0 +1,146 @@ +registerDirs( + [ + PATH_SRC.config::get( 'dirs/controllersDir' ), + PATH_SRC.config::get( 'dirs/librariesDir' ), + PATH_SRC.config::get( 'dirs/modelsDir' ), + ] +); + +$loader->registerNamespaces( + [ + 'controllers' => ROOT_PATH.config::get( 'dirs/controllersDir' ), + 'lib' => ROOT_PATH.config::get( 'dirs/librariesDir' ), + 'models' => ROOT_PATH.config::get( 'dirs/modelsDir' ), + ] +); + +$loader->register(); + +///////////////////////////////////////////////////////////// + + + +// Используем стандартный для CLI контейнер зависимостей +$di = new CliDI(); + +$di->set("config", $config); + +$di->set( 'cache', function() +{ + $cache = new \Phalcon\Cache\Frontend\Data([ + 'lifetime' => 60, + ]); + + return new \Phalcon\Cache\Backend\Memcache( + $cache, + [ + 'host' => '127.0.0.1', + 'port' => 11211, + ] + ); +}, true ); + +$di->set( 'database', function() +{ + $config = + [ + 'host' => config::get('global#database/server'), + 'username' => config::get('global#database/user'), + 'password' => config::get('global#database/passwd'), + 'dbname' => config::get('global#database/db'), + 'schema' => 'public', + ]; + + $database = new \Phalcon\Db\Adapter\Pdo\Postgresql( $config ); + + return $database; + +}, true ); + +$di->set( 'db', function() +{ + return new \db(); +}, true ); + +$di->set( 'common', function() +{ + return new \common(); +}, true ); + +$di->set('modelsManager', function() { + return new \Phalcon\Mvc\Model\Manager(); +}); + +$di->set( 'models', function() +{ + return new \models(); +}, true ); + +$di->set( 'sendmail', function() +{ + return new \sendmail(); +}, true ); + +///////////////////////////////////////////////////////////// + + +// Создаем консольное приложение +$console = new ConsoleApp(); + +$console->setDI($di); + +///////////////////////////////////////////////////////////// + +/** + * Определяем консольные аргументы + */ +$arguments = []; + +foreach ($argv as $k => $arg) { + if ($k === 1) { + $arguments["task"] = $arg; + } elseif ($k === 2) { + $arguments["action"] = $arg; + } elseif ($k >= 3) { + $arguments["params"][] = $arg; + } +} + + + +try { + $console->handle($arguments); +} catch (\Phalcon\Exception $e) { + echo $e->getMessage(); + + exit(255); +} \ No newline at end of file diff --git a/src/app/frontend/controllers/MenuController.php b/src/app/frontend/controllers/MenuController.php index 94b6020..37a4fcd 100644 --- a/src/app/frontend/controllers/MenuController.php +++ b/src/app/frontend/controllers/MenuController.php @@ -36,6 +36,7 @@ class MenuController extends \controllers\ControllerBase $cities[strval($c->CityID)] = strval($c->Description); } + // применение скидок, промокода if ( !empty( $in_cart ) ) { $cart = $this->common->getCartItems($in_cart, $this->lang_id); @@ -63,6 +64,7 @@ class MenuController extends \controllers\ControllerBase $items_ = $cart['items_']; } + //оформление заказа if ( $this->request->isPost() ) { $order['email'] = $this->request->getPost('login_email', 'string', NULL ); @@ -204,12 +206,17 @@ class MenuController extends \controllers\ControllerBase $sms_text = "Vash zakaz prinyat. #:".$proposal_number['proposal_number']." V blijayshee vremya menedjer svyajetsya s Vami (044) 581-67-15"; $this->sms->sendSMS($order['phone'], $sms_text); + //чистим корзину в бд + if ($this->session->get('isAuth')) { + $user_id = $this->session->get('id'); + $this->models->getBasket()->deleteBasket($user_id); + } + // novaposhta if (!empty($proposal_number['novaposhta_tnn'])) { $order['novaposhta_tnn'] = $proposal_number['novaposhta_tnn']; } - if( !empty( $order['email'] ) ) { diff --git a/src/app/tasks/abadoned_basket.php b/src/app/tasks/abadoned_basket.php new file mode 100644 index 0000000..9408ace --- /dev/null +++ b/src/app/tasks/abadoned_basket.php @@ -0,0 +1,51 @@ +'; + + public function mainAction(){ + echo '***main action***'.PHP_EOL; + echo '@var static $from = '.self::$from.PHP_EOL; + } + + public function sendAction(){ + + $subscribers = $this->models->getSubscribe()->getAllData(); + + foreach ($subscribers as $subscriber) { + $id = $subscriber['id']; + $name = $subscriber['name']; + $email = $subscriber['email']; + $date = strtotime($subscriber['date']); + $greeting_status = $subscriber['greeting']; + + $two_days_before = time() - (3600*24*2); + + $header = + 'From: '.self::$from."\n". + 'Reply-To: '.self::$reply_to."\n". + 'Return-Path: '.self::$reply_to."\n". + 'MIME-Version: 1.0'."\n". + 'Content-type: text/html; charset=UTF-8'."\n". + 'Content-Transfer-Encoding: 8bit'."\n". + 'X-Mailer: PHP/' . phpversion(); + $msg['staus'] = '0'; + $msg['text'] = ''; + + } + } + +} \ No newline at end of file diff --git a/src/lib/models/basket.php b/src/lib/models/basket.php index 088baa8..eeaecd1 100644 --- a/src/lib/models/basket.php +++ b/src/lib/models/basket.php @@ -73,6 +73,26 @@ class basket extends \db } + /** + * @param int $user_id + * @return bool + */ + public function deleteUser($user_id) { + + return $this->exec( + ' + DELETE + FROM + public.basket + WHERE + user_id = :user_id + ', + [ + 'user_id' => $user_id + ] + ); + + } /** * @param int $user_id @@ -282,4 +302,14 @@ class basket extends \db } + /** + * @param $user_id + */ + public function deleteBasket($user_id) { + + $this->deleteUser($user_id); + $this->deleteAllItems($user_id); + + } + } \ No newline at end of file -- libgit2 0.21.4