Skip to content

Commit b8ecf0b

Browse files
skeeks-semenovskeeks-semenov
committed
Fixed mailer
1 parent 7d4b01e commit b8ecf0b

File tree

4 files changed

+76
-37
lines changed

4 files changed

+76
-37
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Changelog
33

44
1.0.0-alpha17.pre
55
-----------------
6+
* Fixed mailer
67
* Fixed small bugs
78
* Min and Max quantity shop
89

‎models/ShopOrder.php

Lines changed: 69 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use skeeks\cms\models\CmsContentElement;
77
use skeeks\cms\models\CmsSite;
88
use skeeks\cms\models\CmsUser;
9+
use skeeks\cms\shop\Module;
910
use skeeks\modules\cms\money\Currency;
1011
use skeeks\modules\cms\money\Money;
1112
use Yii;
@@ -175,15 +176,23 @@ public function beforeUpdateCallback($e)
175176
//Письмо тому кто заказывает
176177
if ($this->user->email)
177178
{
178-
\Yii::$app->mailer->view->theme->pathMap['@app/mail'][] = '@skeeks/cms/shop/mail';
179+
try
180+
{
181+
\Yii::$app->mailer->view->theme->pathMap['@app/mail'][] = '@skeeks/cms/shop/mail';
182+
183+
\Yii::$app->mailer->compose('order-status-change', [
184+
'order' => $this
185+
])
186+
->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->cms->appName . ''])
187+
->setTo($this->user->email)
188+
->setSubject(\Yii::$app->cms->appName . ': ' .\Yii::t('skeeks/shop/app','Change order status'). ' #' . $this->id)
189+
->send();
190+
191+
} catch (\Exception $e)
192+
{
193+
\Yii::error('Ошибка отправки email: ' . $e->getMessage(), Module::className());
194+
}
179195

180-
\Yii::$app->mailer->compose('order-status-change', [
181-
'order' => $this
182-
])
183-
->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->cms->appName . ''])
184-
->setTo($this->user->email)
185-
->setSubject(\Yii::$app->cms->appName . ': ' .\Yii::t('skeeks/shop/app','Change order status'). ' #' . $this->id)
186-
->send();
187196
}
188197
}
189198

@@ -198,15 +207,23 @@ public function beforeUpdateCallback($e)
198207
//Письмо тому кто заказывает
199208
if ($this->user->email)
200209
{
201-
\Yii::$app->mailer->view->theme->pathMap['@app/mail'][] = '@skeeks/cms/shop/mail';
202-
203-
\Yii::$app->mailer->compose('order-allow-payment', [
204-
'order' => $this
205-
])
206-
->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->cms->appName . ''])
207-
->setTo($this->user->email)
208-
->setSubject(\Yii::$app->cms->appName . ': ' .\Yii::t('skeeks/shop/app','Resolution of payment on request'). ' #' . $this->id)
209-
->send();
210+
try
211+
{
212+
213+
\Yii::$app->mailer->view->theme->pathMap['@app/mail'][] = '@skeeks/cms/shop/mail';
214+
215+
\Yii::$app->mailer->compose('order-allow-payment', [
216+
'order' => $this
217+
])
218+
->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->cms->appName . ''])
219+
->setTo($this->user->email)
220+
->setSubject(\Yii::$app->cms->appName . ': ' .\Yii::t('skeeks/shop/app','Resolution of payment on request'). ' #' . $this->id)
221+
->send();
222+
223+
} catch (\Exception $e)
224+
{
225+
\Yii::error('Ошибка отправки email: ' . $e->getMessage(), Module::className());
226+
}
210227
}
211228
}
212229

@@ -221,15 +238,23 @@ public function beforeUpdateCallback($e)
221238
//Письмо тому кто заказывает
222239
if ($this->user->email)
223240
{
224-
\Yii::$app->mailer->view->theme->pathMap['@app/mail'][] = '@skeeks/cms/shop/mail';
225-
226-
\Yii::$app->mailer->compose('order-allow-delivery', [
227-
'order' => $this
228-
])
229-
->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->cms->appName . ''])
230-
->setTo($this->user->email)
231-
->setSubject(\Yii::$app->cms->appName . ': ' .\Yii::t('skeeks/shop/app','Resolution of payment on request'). ' #' . $this->id)
232-
->send();
241+
try
242+
{
243+
244+
\Yii::$app->mailer->view->theme->pathMap['@app/mail'][] = '@skeeks/cms/shop/mail';
245+
246+
\Yii::$app->mailer->compose('order-allow-delivery', [
247+
'order' => $this
248+
])
249+
->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->cms->appName . ''])
250+
->setTo($this->user->email)
251+
->setSubject(\Yii::$app->cms->appName . ': ' .\Yii::t('skeeks/shop/app','Resolution of payment on request'). ' #' . $this->id)
252+
->send();
253+
254+
} catch (\Exception $e)
255+
{
256+
\Yii::error('Ошибка отправки email: ' . $e->getMessage(), Module::className());
257+
}
233258
}
234259
}
235260

@@ -247,15 +272,22 @@ public function beforeUpdateCallback($e)
247272
//Письмо тому кто заказывает
248273
if ($this->user->email)
249274
{
250-
\Yii::$app->mailer->view->theme->pathMap['@app/mail'][] = '@skeeks/cms/shop/mail';
251-
252-
\Yii::$app->mailer->compose('order-canceled', [
253-
'order' => $this
254-
])
255-
->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->cms->appName . ''])
256-
->setTo($this->user->email)
257-
->setSubject(\Yii::$app->cms->appName . ': ' .\Yii::t('skeeks/shop/app','Cancellations'). ' #' . $this->id)
258-
->send();
275+
try
276+
{
277+
278+
\Yii::$app->mailer->view->theme->pathMap['@app/mail'][] = '@skeeks/cms/shop/mail';
279+
280+
\Yii::$app->mailer->compose('order-canceled', [
281+
'order' => $this
282+
])
283+
->setFrom([\Yii::$app->cms->adminEmail => \Yii::$app->cms->appName . ''])
284+
->setTo($this->user->email)
285+
->setSubject(\Yii::$app->cms->appName . ': ' .\Yii::t('skeeks/shop/app','Cancellations'). ' #' . $this->id)
286+
->send();
287+
} catch (\Exception $e)
288+
{
289+
\Yii::error('Ошибка отправки email: ' . $e->getMessage(), Module::className());
290+
}
259291
}
260292
}
261293
}
@@ -284,8 +316,9 @@ public function rules()
284316
[['pay_voucher_num', 'delivery_doc_num'], 'string', 'max' => 20],
285317
[['tracking_number'], 'string', 'max' => 100],
286318

287-
[['payed', 'canceled', 'status_code', 'allow_delivery', 'update_1c', 'deducted', 'marked', 'reserved', 'external_order'], 'default', 'value' => Cms::BOOL_N],
319+
[['payed', 'canceled', 'allow_delivery', 'update_1c', 'deducted', 'marked', 'reserved', 'external_order'], 'default', 'value' => Cms::BOOL_N],
288320
[['recount_flag'], 'default', 'value' => Cms::BOOL_Y],
321+
[['status_code'], 'default', 'value' => ShopOrderStatus::STATUS_CODE_START],
289322
[['status_at'], 'default', 'value' => \Yii::$app->formatter->asTimestamp(time())],
290323
[['currency_code'], 'default', 'value' => \Yii::$app->money->currencyCode],
291324
[['site_id'], 'default', 'value' => \Yii::$app->cms->site->id],

‎views/admin-order/_form.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,11 @@
529529
'format' => 'raw',
530530
'value' => function(\skeeks\cms\shop\models\ShopOrderChange $shopOrderChange)
531531
{
532+
if (!$shopOrderChange->createdBy)
533+
{
534+
return ' - ';
535+
}
536+
532537
return (new \skeeks\cms\shop\widgets\AdminBuyerUserWidget(['user' => $shopOrderChange->createdBy]))->run();
533538
}
534539
],

‎widgets/AdminBuyerUserWidget.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class AdminBuyerUserWidget extends Widget
2929
public function run()
3030
{
3131
return (new AdminImagePreviewWidget([
32-
'image' => $this->user->image,
32+
'image' => $this->user ? $this->user->image : null,
3333
'maxWidth' => "25px"
3434
]))->run() . " " . Html::a($this->user->displayName, \skeeks\cms\helpers\UrlHelper::construct(['/shop/admin-buyer-user/update', 'pk' => $this->user->id ])->enableAdmin(), [
3535
'data-pjax' => 0

0 commit comments

Comments
 (0)