RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-22 13:16:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11 from cyradin/master

Browse Source 
fix order send fail when delivery code is an empty string
This commit is contained in:
Alex Lushpai 2016-08-02 14:34:54 +03:00 committed by GitHub
commit fcfe1ea641
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/model/retailcrm/order.php
View File

@ -136,7 +136,9 @@ class ModelRetailcrmOrder extends Model {
$country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ; $country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ;
$order['delivery'] = array( $order['delivery'] = array(
'code' => $settings['retailcrm_delivery'][$delivery_code], 'code' => !empty($settings['retailcrm_delivery'][$delivery_code])
? $settings['retailcrm_delivery'][$delivery_code]
: null,
'cost' => $deliveryCost, 'cost' => $deliveryCost,
'address' => array( 'address' => array(
'index' => $order_data['shipping_postcode'], 'index' => $order_data['shipping_postcode'],