@@ -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; |
@@ -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', | |||
]; | |||
} | |||
@@ -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'); | |||
} | |||
} |