This commit is contained in:
dkorol 2016-04-08 16:39:51 +03:00
parent 0b5b07a19c
commit 1ffb7387dc

View File

@ -124,7 +124,7 @@ class ModelRetailcrmHistory extends Model
$data['payment_address'] = '0'; $data['payment_address'] = '0';
$data['payment_firstname'] = $order['firstName']; $data['payment_firstname'] = $order['firstName'];
$data['payment_lastname'] = (!empty($order['lastName'])) ? $order['lastName'] : ' '; $data['payment_lastname'] = (!empty($order['lastName'])) ? $order['lastName'] : ' ';
$data['payment_address_1'] = $order['customer']['address']['text']; $data['payment_address_1'] = isset($order['customer']['address']) ? $order['customer']['address']['text'] : '';
$data['payment_address_2'] = ''; $data['payment_address_2'] = '';
$data['payment_company'] = ''; $data['payment_company'] = '';
$data['payment_company_id'] = ''; $data['payment_company_id'] = '';
@ -162,6 +162,7 @@ class ModelRetailcrmHistory extends Model
$data['shipping'] = $this->delivery[$order['delivery']['code']]; $data['shipping'] = $this->delivery[$order['delivery']['code']];
$data['shipping_method'] = $this->ocDelivery[$data['shipping']]; $data['shipping_method'] = $this->ocDelivery[$data['shipping']];
$data['shipping_code'] = $this->delivery[$order['delivery']['code']]; $data['shipping_code'] = $this->delivery[$order['delivery']['code']];
$data['payment'] = $this->payment[$order['paymentType']]; $data['payment'] = $this->payment[$order['paymentType']];
$data['payment_method'] = $this->ocPayment[$data['payment']]; $data['payment_method'] = $this->ocPayment[$data['payment']];
$data['payment_code'] = $this->payment[$order['paymentType']]; $data['payment_code'] = $this->payment[$order['paymentType']];