RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-03-03 11:43:16 +03:00
Code Issues Projects Releases Wiki Activity

check for advancedcheckout

Browse Source
This commit is contained in:
Alex Lushpai 2014-05-14 16:50:31 +04:00
parent 7c3d166256
commit 6efbf83492
1 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
intarocrm/intarocrm.php
View File

@ -36,6 +36,7 @@ class IntaroCRM extends Module
$this->registerHook('newOrder') && $this->registerHook('newOrder') &&
$this->registerHook('actionOrderStatusPostUpdate') && $this->registerHook('actionOrderStatusPostUpdate') &&
$this->registerHook('actionPaymentConfirmation') $this->registerHook('actionPaymentConfirmation')
); );
} }
@ -97,8 +98,7 @@ class IntaroCRM extends Module
$this->displayConfirmation($this->l('Settings updated')); $this->displayConfirmation($this->l('Settings updated'));
$default_lang = $this->default_lang; $default_lang = $this->default_lang;
$intaroCrm = $this->intaroCRM;
$intaroCrm = $this->intaroCRM;
/* /*
* Network connection form * Network connection form
@ -271,6 +271,7 @@ class IntaroCRM extends Module
$address = Db::getInstance()->ExecuteS($sql); $address = Db::getInstance()->ExecuteS($sql);
$address = $address[0]; $address = $address[0];
$delivery = json_decode(Configuration::get('INTAROCRM_API_DELIVERY')); $delivery = json_decode(Configuration::get('INTAROCRM_API_DELIVERY'));
$payment = json_decode(Configuration::get('INTAROCRM_API_PAYMENT'));
$inCart = $params['cart']->getProducts(); $inCart = $params['cart']->getProducts();
if (isset($params['orderStatus'])) { if (isset($params['orderStatus'])) {
@ -315,6 +316,11 @@ class IntaroCRM extends Module
} }
$dTypeKey = $params['cart']->id_carrier; $dTypeKey = $params['cart']->id_carrier;
if (Module::getInstanceByName('advancedcheckout') === false) {
$pTypeKey = $params['order']->module;
} else {
$pTypeKey = $params['order']->payment;
}
$this->intaroCRM->orderCreate( $this->intaroCRM->orderCreate(
array( array(
'externalId' => $params['order']->id, 'externalId' => $params['order']->id,
@ -326,7 +332,7 @@ class IntaroCRM extends Module
'phone' => $address['phone'], 'phone' => $address['phone'],
'email' => $params['customer']->email, 'email' => $params['customer']->email,
'paymentStatus' => 'not-paid', 'paymentStatus' => 'not-paid',
//'paymentType' => 'cash', 'paymentType' => $payment->$pTypeKey,
'deliveryType' => $delivery->$dTypeKey, 'deliveryType' => $delivery->$dTypeKey,
'deliveryCost' => $params['order']->total_shipping, 'deliveryCost' => $params['order']->total_shipping,
'status' => 'new', 'status' => 'new',
@ -522,7 +528,7 @@ class IntaroCRM extends Module
$paymentTypes[] = array( $paymentTypes[] = array(
'type' => 'select', 'type' => 'select',
'label' => $payment['name'], 'label' => $payment['name'],
'name' => 'INTAROCRM_API_PAYMENT[' . $payment['id'] . ']', 'name' => 'INTAROCRM_API_PAYMENT[' . $payment['code'] . ']',
'required' => false, 'required' => false,
'options' => array( 'options' => array(
'query' => $this->getApiPaymentTypes($intaroCrm), 'query' => $this->getApiPaymentTypes($intaroCrm),
@ -543,55 +549,71 @@ class IntaroCRM extends Module
/* Get all modules then select only payment ones */ /* Get all modules then select only payment ones */
$modules = Module::getModulesOnDisk(true); $modules = Module::getModulesOnDisk(true);
foreach ($modules as $module) { /*
if ($module->tab == 'payments_gateways') * Hack for knivesland
{ */
if ($module->id) if (Module::getInstanceByName('advancedcheckout') === false) {
foreach ($modules as $module) {
if ($module->tab == 'payments_gateways')
{ {
if (!get_class($module) == 'SimpleXMLElement') if ($module->id)
$module->country = array(); {
$countries = DB::getInstance()->executeS(' if (!get_class($module) == 'SimpleXMLElement')
$module->country = array();
$countries = DB::getInstance()->executeS('
SELECT id_country SELECT id_country
FROM '._DB_PREFIX_.'module_country FROM '._DB_PREFIX_.'module_country
WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id
); );
foreach ($countries as $country) foreach ($countries as $country)
$module->country[] = $country['id_country']; $module->country[] = $country['id_country'];
if (!get_class($module) == 'SimpleXMLElement') if (!get_class($module) == 'SimpleXMLElement')
$module->currency = array(); $module->currency = array();
$currencies = DB::getInstance()->executeS(' $currencies = DB::getInstance()->executeS('
SELECT id_currency SELECT id_currency
FROM '._DB_PREFIX_.'module_currency FROM '._DB_PREFIX_.'module_currency
WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id
); );
foreach ($currencies as $currency) foreach ($currencies as $currency)
$module->currency[] = $currency['id_currency']; $module->currency[] = $currency['id_currency'];
if (!get_class($module) == 'SimpleXMLElement') if (!get_class($module) == 'SimpleXMLElement')
$module->group = array(); $module->group = array();
$groups = DB::getInstance()->executeS(' $groups = DB::getInstance()->executeS('
SELECT id_group SELECT id_group
FROM '._DB_PREFIX_.'module_group FROM '._DB_PREFIX_.'module_group
WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id WHERE id_module = '.(int)$module->id.' AND `id_shop`='.(int)$shop_id
); );
foreach ($groups as $group) foreach ($groups as $group)
$module->group[] = $group['id_group']; $module->group[] = $group['id_group'];
} }
else else
{ {
$module->country = null; $module->country = null;
$module->currency = null; $module->currency = null;
$module->group = null; $module->group = null;
} }
if ($module->active != 0) { if ($module->active != 0) {
$this->payment_modules[] = array( $this->payment_modules[] = array(
'id' => $module->id, 'id' => $module->id,
'name' => $module->displayName 'code' => $module->name,
); 'name' => $module->displayName
} );
}
}
}
} else {
require_once(dirname(__FILE__) . '/../advancedcheckout/classes/Payment.php');
$modules = Payment::getPaymentMethods();
foreach ($modules as $module) {
$this->payment_modules[] = array(
'id' => $module['id_payment'],
'code' => $module['name'],
'name' => $module['name']
);
} }
} }