Administrator / new_rukzachok-1

Commit d56a651d87d3527d0a1e6b9380b5b10c6b7f6de9

Authored by Administrator
2 parents a4de14cb 40366ecb

Merge remote-tracking branch 'origin/master'

Showing 4 changed files with 10 additions and 39 deletions   Show diff stats
Inline Side-by-side
common/components/SmsSender.php
  Show/Hide comments   View file @d56a651
... ... @@ -14,14 +14,14 @@ class SmsSender extends Component
14 14 public function send($tel, $text)
15 15 {
16 16  
17   - $text = iconv('windows-1251', 'utf-8', htmlspecialchars($text));
  17 + // $text = iconv('windows-1251', 'utf-8', htmlspecialchars($text));
18 18 $description = iconv('windows-1251', 'utf-8', htmlspecialchars($tel . ' description'));
19 19 $start_time = 'AUTO'; // отправить немедленно или ставим дату и время в формате YYYY-MM-DD HH:MM:SS
20 20 $end_time = 'AUTO'; // автоматически рассчитать системой или ставим дату и время в формате YYYY-MM-DD HH:MM:SS
21 21 $rate = 1; // скорость отправки сообщений (1 = 1 смс минута). Одиночные СМС сообщения отправляются всегда с максимальной скоростью.
22 22 $lifetime = 4; // срок жизни сообщения 4 часа
23 23  
24   - $source = 'extremstyle'; // Alfaname
  24 + $source = 'rukzachok'; // Alfaname
25 25 $recipient = $tel;
26 26 $user = '380674064008';
27 27 $password = 'smsartweb2012';
... ...
common/config/main.php
  Show/Hide comments   View file @d56a651
... ... @@ -12,6 +12,10 @@ return [
12 12 ],
13 13 ],
14 14  
  15 + 'sms' => [
  16 + 'class' => 'common\components\SmsSender',
  17 + ],
  18 +
15 19 'cache' => [
16 20 'class' => 'yii\caching\FileCache',
17 21 ],
... ...
frontend/controllers/BasketController.php
  Show/Hide comments   View file @d56a651
... ... @@ -120,6 +120,9 @@ class BasketController extends Controller
120 120 ]
121 121 ]);
122 122  
  123 + $text = "# zakaz: ". $order->id .". V blijayshee vremya menedjer svyajetsya s Vami. (044) 303 90 15";
  124 + Yii::$app->sms->send($order->phone, $text);
  125 +
123 126 return $this->render('success',[
124 127 'order' => $order,
125 128 'variants' => $productV,
... ...
frontend/widgets/Seo.php
  Show/Hide comments   View file @d56a651
... ... @@ -81,43 +81,7 @@ class Seo extends Widget
81 81 // return $filter_row;
82 82 // }
83 83  
84   - if(!empty($filter)) {
85   -
86   - $array = [
87   - 'category' => $this->category_name
88   - ];
89   -
90   -
91   - if (isset($filter['brands']) && count($filter['brands']) == 1) {
92   - $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one();
93   -
94   - $array['brand'] = $model->name;
95   - }
96   -
97   - if (isset($filter['options']["pol"]) && count($filter['options']["pol"]) == 1) {
98   -
99   - $model = TaxOption::find()->where(['alias' => $filter['options']["pol"]])->one();
100   - $array['sex'] = $model->value->value;
101   -
102   -
103   - }
104   -
105   - if (isset($filter['options']["naznacenie"]) && count($filter['options']["naznacenie"]) == 1) {
106   -
107   - $model = TaxOption::find()->where(['alias' => $filter['options']["naznacenie"]])->one();
108   - $array['naz'] = $model->value->value;
109   -
110   - }
111   -
112   - if (isset($filter['options']["god"]) && count($filter['options']["god"]) == 1) {
113   -
114   - $model = TaxOption::find()->where(['alias' => $filter['options']["god"]])->one();
115   - $array['year'] = $model->value->value;
116   -
117   - }
118   - return $this->getTitleString($array);
119   -
120   - } else if (!empty($title)) {
  84 + if (!empty($title)) {
121 85 return $title;
122 86 } else {
123 87 return $this->project_name;
... ...