浏览代码

[Backend] Problème synchronisation Tiller #238

refactoring
Guillaume 2 年前
父节点
当前提交
0d31ba5e27
共有 4 个文件被更改,包括 1427 次插入1324 次删除
  1. +1396
    -1320
      backend/controllers/DistributionController.php
  2. +1
    -1
      common/helpers/Tiller.php
  3. +4
    -3
      common/models/Order.php
  4. +26
    -0
      console/migrations/m220802_092239_add_field_order_tiller_external_id.php

+ 1396
- 1320
backend/controllers/DistributionController.php
文件差异内容过多而无法显示
查看文件


+ 1
- 1
common/helpers/Tiller.php 查看文件

@@ -90,7 +90,7 @@ class Tiller
$ordersOpendistribSynchro[$orderOpendistrib->id] = false;
if(isset($ordersTiller->orders)) {
foreach ($ordersTiller->orders as $orderTiller) {
if ($orderOpendistrib->id == $orderTiller->externalId
if ($orderOpendistrib->tiller_external_id == $orderTiller->externalId
&& (int) round($orderOpendistrib->getAmountWithTax(Order::AMOUNT_TOTAL) * 100) == (int) $orderTiller->currentBill) {

$ordersOpendistribSynchro[$orderOpendistrib->id] = true;

+ 4
- 3
common/models/Order.php 查看文件

@@ -114,8 +114,8 @@ class Order extends ActiveRecordCommon
'integer'
],
[['auto_payment', 'tiller_synchronization', 'delivery_home'], 'boolean'],
[['status', 'reference', 'delivery_address', 'online_payment_url'], 'string'],
[['date', 'date_update', 'comment', 'comment_point_sale', 'mean_payment'], 'safe']
[['status', 'reference', 'delivery_address', 'online_payment_url', 'tiller_external_id'], 'string'],
[['date', 'date_update', 'comment', 'comment_point_sale', 'mean_payment', 'tiller_external_id'], 'safe']
];
}

@@ -139,7 +139,8 @@ class Order extends ActiveRecordCommon
'reference' => 'Référence',
'delivery_home' => 'Livraison à domicile',
'delivery_address' => 'Adresse de livraison',
'online_payment_url' => 'URL de paiement'
'online_payment_url' => 'URL de paiement',
'tiller_external_id' => 'Tiller : externalId',
];
}


+ 26
- 0
console/migrations/m220802_092239_add_field_order_tiller_external_id.php 查看文件

@@ -0,0 +1,26 @@
<?php

use yii\db\Migration;
use yii\db\Schema;

/**
* Class m220802_092239_add_field_order_tiller_external_id
*/
class m220802_092239_add_field_order_tiller_external_id extends Migration
{
/**
* {@inheritdoc}
*/
public function safeUp()
{
$this->addColumn('order', 'tiller_external_id', Schema::TYPE_STRING.' DEFAULT NULL');
}

/**
* {@inheritdoc}
*/
public function safeDown()
{
$this->dropColumn('order', 'tiller_external_id');
}
}

正在加载...
取消
保存