Version Notes
- own shipping method added
- fixed some bugs
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Channelpilotsolutions_Channelpilot |
| Version | 2.1.5 |
| Comparing to | |
| See all releases | |
Code changes from version 2.1.4 to 2.1.5
- app/code/community/Channelpilotsolutions/Channelpilot/Helper/api/1_0/ChannelPilotSellerAPI_v1_0.php +2 -1
- app/code/community/Channelpilotsolutions/Channelpilot/Helper/api/1_0/thin/CPDelivery.php +54 -54
- app/code/community/Channelpilotsolutions/Channelpilot/Helper/handler/CPStatusHandler.php +176 -177
- app/code/community/Channelpilotsolutions/Channelpilot/Model/Carrier/Cpshipping.php +77 -0
- app/code/community/Channelpilotsolutions/Channelpilot/etc/config.xml +17 -5
- app/code/community/Channelpilotsolutions/Channelpilot/etc/system.xml +126 -24
- app/locale/de_AT/Channelpilotsolutions_Channelpilot.csv +14 -1
- app/locale/de_CH/Channelpilotsolutions_Channelpilot.csv +14 -1
- app/locale/de_DE/Channelpilotsolutions_Channelpilot.csv +14 -1
- app/locale/en_AU/Channelpilotsolutions_Channelpilot.csv +14 -1
- app/locale/en_CA/Channelpilotsolutions_Channelpilot.csv +14 -1
- app/locale/en_GB/Channelpilotsolutions_Channelpilot.csv +14 -1
- app/locale/en_IE/Channelpilotsolutions_Channelpilot.csv +14 -1
- app/locale/en_NZ/Channelpilotsolutions_Channelpilot.csv +14 -1
- app/locale/en_US/Channelpilotsolutions_Channelpilot.csv +14 -1
- package.xml +6 -5
app/code/community/Channelpilotsolutions/Channelpilot/Helper/api/1_0/ChannelPilotSellerAPI_v1_0.php
CHANGED
|
@@ -38,7 +38,8 @@ require_once 'responses/GetManagedArticlePricesResponse.php';
|
|
| 38 |
class ChannelPilotSellerAPI_v1_0 extends SoapClient {
|
| 39 |
|
| 40 |
private $auth;
|
| 41 |
-
private $wsdlUrl = '
|
|
|
|
| 42 |
private $soapOptions = array(
|
| 43 |
'connection_timeout' => 20,
|
| 44 |
'features' => SOAP_SINGLE_ELEMENT_ARRAYS
|
| 38 |
class ChannelPilotSellerAPI_v1_0 extends SoapClient {
|
| 39 |
|
| 40 |
private $auth;
|
| 41 |
+
private $wsdlUrl = 'http://seller.api.channelpilot.com/1_0?wsdl';
|
| 42 |
+
private $uri = 'http://seller.api.channelpilot.com/1_0';
|
| 43 |
private $soapOptions = array(
|
| 44 |
'connection_timeout' => 20,
|
| 45 |
'features' => SOAP_SINGLE_ELEMENT_ARRAYS
|
app/code/community/Channelpilotsolutions/Channelpilot/Helper/api/1_0/thin/CPDelivery.php
CHANGED
|
@@ -1,54 +1,54 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
/**
|
| 4 |
-
* Holds information about a delivery.
|
| 5 |
-
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 6 |
-
* @version 1.0
|
| 7 |
-
*/
|
| 8 |
-
class CPDelivery {
|
| 9 |
-
/**
|
| 10 |
-
* @var type CPOrderHeader
|
| 11 |
-
*/
|
| 12 |
-
public $orderHeader;
|
| 13 |
-
|
| 14 |
-
/**
|
| 15 |
-
* are all to be delivered items deliverd after this delivery?
|
| 16 |
-
* @var type boolean
|
| 17 |
-
*/
|
| 18 |
-
public $isDeliveryCompleted;
|
| 19 |
-
|
| 20 |
-
/**
|
| 21 |
-
* tracking-number for this delivery
|
| 22 |
-
* @var type String
|
| 23 |
-
*/
|
| 24 |
-
public $trackingNumber;
|
| 25 |
-
|
| 26 |
-
/**
|
| 27 |
-
* the
|
| 28 |
-
* @var type String
|
| 29 |
-
*/
|
| 30 |
-
public $carrierName;
|
| 31 |
-
|
| 32 |
-
/**
|
| 33 |
-
*
|
| 34 |
-
* @var type CPShipping
|
| 35 |
-
*/
|
| 36 |
-
public $shipping;
|
| 37 |
-
|
| 38 |
-
public $deliveryTime;
|
| 39 |
-
|
| 40 |
-
/**
|
| 41 |
-
* array of delivered items. is only evaluated and neccessary if ($isDeliveryCompleted == false).
|
| 42 |
-
* @var type CPOrderItem[]
|
| 43 |
-
*/
|
| 44 |
-
public $deliveredItems = array();
|
| 45 |
-
|
| 46 |
-
function __construct($orderId, $source, $isDeliveryCompleted, $trackingNumber, $deliveryTime) {
|
| 47 |
-
$this->orderHeader = new CPOrderHeader(null, $orderId, $source, $isDeliveryCompleted ? CPOrderStatus::ID_DELIVERED : CPOrderStatus::ID_PARTIALLY_DELIVERED, null, false);
|
| 48 |
-
$this->trackingNumber = $trackingNumber;
|
| 49 |
-
$this->deliveryTime = $deliveryTime;
|
| 50 |
-
$this->isDeliveryCompleted = $isDeliveryCompleted;
|
| 51 |
-
}
|
| 52 |
-
}
|
| 53 |
-
|
| 54 |
-
?>
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
/**
|
| 4 |
+
* Holds information about a delivery.
|
| 5 |
+
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 6 |
+
* @version 1.0
|
| 7 |
+
*/
|
| 8 |
+
class CPDelivery {
|
| 9 |
+
/**
|
| 10 |
+
* @var type CPOrderHeader
|
| 11 |
+
*/
|
| 12 |
+
public $orderHeader;
|
| 13 |
+
|
| 14 |
+
/**
|
| 15 |
+
* are all to be delivered items deliverd after this delivery?
|
| 16 |
+
* @var type boolean
|
| 17 |
+
*/
|
| 18 |
+
public $isDeliveryCompleted;
|
| 19 |
+
|
| 20 |
+
/**
|
| 21 |
+
* tracking-number for this delivery
|
| 22 |
+
* @var type String
|
| 23 |
+
*/
|
| 24 |
+
public $trackingNumber;
|
| 25 |
+
|
| 26 |
+
/**
|
| 27 |
+
* the Carrier (DHL/UPS/...). if not set, channelpilot will take the default-Carrier defined for the orders shippingType
|
| 28 |
+
* @var type String
|
| 29 |
+
*/
|
| 30 |
+
public $carrierName;
|
| 31 |
+
|
| 32 |
+
/**
|
| 33 |
+
*
|
| 34 |
+
* @var type CPShipping
|
| 35 |
+
*/
|
| 36 |
+
public $shipping;
|
| 37 |
+
|
| 38 |
+
public $deliveryTime;
|
| 39 |
+
|
| 40 |
+
/**
|
| 41 |
+
* array of delivered items. is only evaluated and neccessary if ($isDeliveryCompleted == false).
|
| 42 |
+
* @var type CPOrderItem[]
|
| 43 |
+
*/
|
| 44 |
+
public $deliveredItems = array();
|
| 45 |
+
|
| 46 |
+
function __construct($orderId, $source, $isDeliveryCompleted, $trackingNumber, $deliveryTime) {
|
| 47 |
+
$this->orderHeader = new CPOrderHeader(null, $orderId, $source, $isDeliveryCompleted ? CPOrderStatus::ID_DELIVERED : CPOrderStatus::ID_PARTIALLY_DELIVERED, null, false);
|
| 48 |
+
$this->trackingNumber = $trackingNumber;
|
| 49 |
+
$this->deliveryTime = $deliveryTime;
|
| 50 |
+
$this->isDeliveryCompleted = $isDeliveryCompleted;
|
| 51 |
+
}
|
| 52 |
+
}
|
| 53 |
+
|
| 54 |
+
?>
|
app/code/community/Channelpilotsolutions/Channelpilot/Helper/handler/CPStatusHandler.php
CHANGED
|
@@ -1,177 +1,176 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
/**
|
| 4 |
-
* an cp shop
|
| 5 |
-
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 6 |
-
* @version 1.0
|
| 7 |
-
*/
|
| 8 |
-
class CPShop {
|
| 9 |
-
|
| 10 |
-
public $title;
|
| 11 |
-
public $id;
|
| 12 |
-
public $active;
|
| 13 |
-
public $isRegistered;
|
| 14 |
-
public $deliveryTypes;
|
| 15 |
-
public $paymentTypes;
|
| 16 |
-
|
| 17 |
-
}
|
| 18 |
-
|
| 19 |
-
/**
|
| 20 |
-
* an cp payment type
|
| 21 |
-
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 22 |
-
* @version 1.0
|
| 23 |
-
*/
|
| 24 |
-
class CPPaymentType {
|
| 25 |
-
|
| 26 |
-
public $title;
|
| 27 |
-
public $id;
|
| 28 |
-
public $active;
|
| 29 |
-
|
| 30 |
-
}
|
| 31 |
-
|
| 32 |
-
/**
|
| 33 |
-
* an cp customer group type
|
| 34 |
-
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 35 |
-
* @version 1.0
|
| 36 |
-
*/
|
| 37 |
-
class CPCustomerGroupType {
|
| 38 |
-
|
| 39 |
-
public $title;
|
| 40 |
-
public $id;
|
| 41 |
-
public $active;
|
| 42 |
-
|
| 43 |
-
}
|
| 44 |
-
|
| 45 |
-
/**
|
| 46 |
-
* an cp delivery type
|
| 47 |
-
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 48 |
-
* @version 1.0
|
| 49 |
-
*/
|
| 50 |
-
class CPDeliveryType {
|
| 51 |
-
|
| 52 |
-
public $title;
|
| 53 |
-
public $id;
|
| 54 |
-
public $active;
|
| 55 |
-
|
| 56 |
-
}
|
| 57 |
-
|
| 58 |
-
/**
|
| 59 |
-
* an cp status handler
|
| 60 |
-
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 61 |
-
* @version 1.0
|
| 62 |
-
*/
|
| 63 |
-
class CPStatusHandler extends CPAbstractHandler {
|
| 64 |
-
|
| 65 |
-
/**
|
| 66 |
-
* Handle status event
|
| 67 |
-
*/
|
| 68 |
-
public function handle() {
|
| 69 |
-
$hook = new CPGetStatusHookResponse();
|
| 70 |
-
$hook->shops = self::getShops();
|
| 71 |
-
$hook->resultCode = CPResultCodes::SUCCESS;
|
| 72 |
-
$hook->resultMessage = "ok";
|
| 73 |
-
$hook->writeResponse(self::defaultHeader, json_encode($hook));
|
| 74 |
-
}
|
| 75 |
-
|
| 76 |
-
private function getShops() {
|
| 77 |
-
$allStores = Mage::app()->getStores();
|
| 78 |
-
$shops = array();
|
| 79 |
-
foreach ($allStores as $_eachStoreId => $val) {
|
| 80 |
-
$shop = new CPShop();
|
| 81 |
-
$shop->id = Mage::app()->getStore($_eachStoreId)->getId();
|
| 82 |
-
$shop->title = Mage::app()->getStore($_eachStoreId)->getName();
|
| 83 |
-
$shop->active = (bool) Mage::app()->getStore()->getIsActive();
|
| 84 |
-
$shop->isRegistered = self::isShopRegistered($shop->id);
|
| 85 |
-
$shop->deliveryTypes = self::getDeliveryTypes($shop->id);
|
| 86 |
-
$shop->paymentTypes = self::getPaymentTypes($shop->id);
|
| 87 |
-
$shop->customerGroups = self::getCustomerGroups();
|
| 88 |
-
$shops[] = $shop;
|
| 89 |
-
}
|
| 90 |
-
return $shops;
|
| 91 |
-
}
|
| 92 |
-
|
| 93 |
-
private function getDeliveryTypes($shopId) {
|
| 94 |
-
$carriers = Mage::getStoreConfig('carriers', $shopId);
|
| 95 |
-
$methods = Mage::getSingleton('shipping/config')->getActiveCarriers($shopId);
|
| 96 |
-
$deliveryTypes = array();
|
| 97 |
-
foreach ($methods as $_ccode => $_carrier) {
|
| 98 |
-
if ($carrierMethods = $_carrier->getAllowedMethods()) {
|
| 99 |
-
if (!$_title = Mage::getStoreConfig("carriers/$_ccode/title", $shopId)) {
|
| 100 |
-
$_title = $_ccode;
|
| 101 |
-
}
|
| 102 |
-
foreach ($carrierMethods as $_mcode => $_method) {
|
| 103 |
-
$_code = $_ccode . '_' . $_mcode;
|
| 104 |
-
$deliveryType = new CPDeliveryType();
|
| 105 |
-
$deliveryType->id = $_code;
|
| 106 |
-
$deliveryType->title = $_title . ' - ' . $_method;
|
| 107 |
-
$deliveryType->active = (bool) $carriers[$_ccode]['active'];
|
| 108 |
-
$deliveryTypes[] = $deliveryType;
|
| 109 |
-
}
|
| 110 |
-
}
|
| 111 |
-
}
|
| 112 |
-
return $deliveryTypes;
|
| 113 |
-
}
|
| 114 |
-
|
| 115 |
-
private function getPaymentTypes($shopId) {
|
| 116 |
-
$paymentTypes = array();
|
| 117 |
-
$payments = Mage::getSingleton('payment/config')->getActiveMethods();
|
| 118 |
-
foreach ($payments as $paymentCode => $paymentModel) {
|
| 119 |
-
if ($paymentCode === Mage::getSingleton('channelpilot/payment')->getCode()) {
|
| 120 |
-
$types = Mage::getStoreConfig('payment/' . $paymentCode . '/types', $shopId);
|
| 121 |
-
$cpmp_types = Mage::getSingleton('channelpilot/payment')->getCcTypes();
|
| 122 |
-
foreach (explode(',', $types) as $type) {
|
| 123 |
-
if (isset($cpmp_types[$type])) {
|
| 124 |
-
$paymentType = new CPPaymentType();
|
| 125 |
-
$paymentType->id = $type;
|
| 126 |
-
$paymentType->title = $cpmp_types[$type];
|
| 127 |
-
$paymentType->active = true;
|
| 128 |
-
$paymentTypes[] = $paymentType;
|
| 129 |
-
}
|
| 130 |
-
}
|
| 131 |
-
} else {
|
| 132 |
-
|
| 133 |
-
$paymentTitle = Mage::getStoreConfig('payment/' . $paymentCode . '/title', $shopId);
|
| 134 |
-
$paymentType = new CPPaymentType();
|
| 135 |
-
$paymentType->id = $paymentCode;
|
| 136 |
-
if (empty($paymentTitle)) {
|
| 137 |
-
$paymentType->title = $paymentCode;
|
| 138 |
-
} else {
|
| 139 |
-
$paymentType->title = $paymentTitle;
|
| 140 |
-
}
|
| 141 |
-
$status = $paymentModel->canUseCheckout();
|
| 142 |
-
if ($status == 1 && $paymentCode != 'free') {
|
| 143 |
-
$paymentType->active = true;
|
| 144 |
-
} else {
|
| 145 |
-
$paymentType->active = false;
|
| 146 |
-
}
|
| 147 |
-
$paymentTypes[] = $paymentType;
|
| 148 |
-
}
|
| 149 |
-
}
|
| 150 |
-
return $paymentTypes;
|
| 151 |
-
}
|
| 152 |
-
|
| 153 |
-
private function getCustomerGroups() {
|
| 154 |
-
$customerGroups = array();
|
| 155 |
-
$
|
| 156 |
-
$
|
| 157 |
-
try {
|
| 158 |
-
$
|
| 159 |
-
$sResult
|
| 160 |
-
|
| 161 |
-
$customerGroup =
|
| 162 |
-
$customerGroup->
|
| 163 |
-
$customerGroup->
|
| 164 |
-
$
|
| 165 |
-
|
| 166 |
-
|
| 167 |
-
|
| 168 |
-
|
| 169 |
-
$
|
| 170 |
-
|
| 171 |
-
|
| 172 |
-
|
| 173 |
-
|
| 174 |
-
|
| 175 |
-
|
| 176 |
-
|
| 177 |
-
?>
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
/**
|
| 4 |
+
* an cp shop
|
| 5 |
+
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 6 |
+
* @version 1.0
|
| 7 |
+
*/
|
| 8 |
+
class CPShop {
|
| 9 |
+
|
| 10 |
+
public $title;
|
| 11 |
+
public $id;
|
| 12 |
+
public $active;
|
| 13 |
+
public $isRegistered;
|
| 14 |
+
public $deliveryTypes;
|
| 15 |
+
public $paymentTypes;
|
| 16 |
+
|
| 17 |
+
}
|
| 18 |
+
|
| 19 |
+
/**
|
| 20 |
+
* an cp payment type
|
| 21 |
+
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 22 |
+
* @version 1.0
|
| 23 |
+
*/
|
| 24 |
+
class CPPaymentType {
|
| 25 |
+
|
| 26 |
+
public $title;
|
| 27 |
+
public $id;
|
| 28 |
+
public $active;
|
| 29 |
+
|
| 30 |
+
}
|
| 31 |
+
|
| 32 |
+
/**
|
| 33 |
+
* an cp customer group type
|
| 34 |
+
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 35 |
+
* @version 1.0
|
| 36 |
+
*/
|
| 37 |
+
class CPCustomerGroupType {
|
| 38 |
+
|
| 39 |
+
public $title;
|
| 40 |
+
public $id;
|
| 41 |
+
public $active;
|
| 42 |
+
|
| 43 |
+
}
|
| 44 |
+
|
| 45 |
+
/**
|
| 46 |
+
* an cp delivery type
|
| 47 |
+
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 48 |
+
* @version 1.0
|
| 49 |
+
*/
|
| 50 |
+
class CPDeliveryType {
|
| 51 |
+
|
| 52 |
+
public $title;
|
| 53 |
+
public $id;
|
| 54 |
+
public $active;
|
| 55 |
+
|
| 56 |
+
}
|
| 57 |
+
|
| 58 |
+
/**
|
| 59 |
+
* an cp status handler
|
| 60 |
+
* @author Channel Pilot Solutions GmbH <api@channelpilot.com>
|
| 61 |
+
* @version 1.0
|
| 62 |
+
*/
|
| 63 |
+
class CPStatusHandler extends CPAbstractHandler {
|
| 64 |
+
|
| 65 |
+
/**
|
| 66 |
+
* Handle status event
|
| 67 |
+
*/
|
| 68 |
+
public function handle() {
|
| 69 |
+
$hook = new CPGetStatusHookResponse();
|
| 70 |
+
$hook->shops = self::getShops();
|
| 71 |
+
$hook->resultCode = CPResultCodes::SUCCESS;
|
| 72 |
+
$hook->resultMessage = "ok";
|
| 73 |
+
$hook->writeResponse(self::defaultHeader, json_encode($hook));
|
| 74 |
+
}
|
| 75 |
+
|
| 76 |
+
private function getShops() {
|
| 77 |
+
$allStores = Mage::app()->getStores();
|
| 78 |
+
$shops = array();
|
| 79 |
+
foreach ($allStores as $_eachStoreId => $val) {
|
| 80 |
+
$shop = new CPShop();
|
| 81 |
+
$shop->id = Mage::app()->getStore($_eachStoreId)->getId();
|
| 82 |
+
$shop->title = Mage::app()->getStore($_eachStoreId)->getName();
|
| 83 |
+
$shop->active = (bool) Mage::app()->getStore()->getIsActive();
|
| 84 |
+
$shop->isRegistered = self::isShopRegistered($shop->id);
|
| 85 |
+
$shop->deliveryTypes = self::getDeliveryTypes($shop->id);
|
| 86 |
+
$shop->paymentTypes = self::getPaymentTypes($shop->id);
|
| 87 |
+
$shop->customerGroups = self::getCustomerGroups();
|
| 88 |
+
$shops[] = $shop;
|
| 89 |
+
}
|
| 90 |
+
return $shops;
|
| 91 |
+
}
|
| 92 |
+
|
| 93 |
+
private function getDeliveryTypes($shopId) {
|
| 94 |
+
$carriers = Mage::getStoreConfig('carriers', $shopId);
|
| 95 |
+
$methods = Mage::getSingleton('shipping/config')->getActiveCarriers($shopId);
|
| 96 |
+
$deliveryTypes = array();
|
| 97 |
+
foreach ($methods as $_ccode => $_carrier) {
|
| 98 |
+
if ($carrierMethods = $_carrier->getAllowedMethods()) {
|
| 99 |
+
if (!$_title = Mage::getStoreConfig("carriers/$_ccode/title", $shopId)) {
|
| 100 |
+
$_title = $_ccode;
|
| 101 |
+
}
|
| 102 |
+
foreach ($carrierMethods as $_mcode => $_method) {
|
| 103 |
+
$_code = $_ccode . '_' . $_mcode;
|
| 104 |
+
$deliveryType = new CPDeliveryType();
|
| 105 |
+
$deliveryType->id = $_code;
|
| 106 |
+
$deliveryType->title = $_title . ' - ' . $_method;
|
| 107 |
+
$deliveryType->active = (bool) $carriers[$_ccode]['active'];
|
| 108 |
+
$deliveryTypes[] = $deliveryType;
|
| 109 |
+
}
|
| 110 |
+
}
|
| 111 |
+
}
|
| 112 |
+
return $deliveryTypes;
|
| 113 |
+
}
|
| 114 |
+
|
| 115 |
+
private function getPaymentTypes($shopId) {
|
| 116 |
+
$paymentTypes = array();
|
| 117 |
+
$payments = Mage::getSingleton('payment/config')->getActiveMethods();
|
| 118 |
+
foreach ($payments as $paymentCode => $paymentModel) {
|
| 119 |
+
if ($paymentCode === Mage::getSingleton('channelpilot/payment')->getCode()) {
|
| 120 |
+
$types = Mage::getStoreConfig('payment/' . $paymentCode . '/types', $shopId);
|
| 121 |
+
$cpmp_types = Mage::getSingleton('channelpilot/payment')->getCcTypes();
|
| 122 |
+
foreach (explode(',', $types) as $type) {
|
| 123 |
+
if (isset($cpmp_types[$type])) {
|
| 124 |
+
$paymentType = new CPPaymentType();
|
| 125 |
+
$paymentType->id = $type;
|
| 126 |
+
$paymentType->title = $cpmp_types[$type];
|
| 127 |
+
$paymentType->active = true;
|
| 128 |
+
$paymentTypes[] = $paymentType;
|
| 129 |
+
}
|
| 130 |
+
}
|
| 131 |
+
} else {
|
| 132 |
+
|
| 133 |
+
$paymentTitle = Mage::getStoreConfig('payment/' . $paymentCode . '/title', $shopId);
|
| 134 |
+
$paymentType = new CPPaymentType();
|
| 135 |
+
$paymentType->id = $paymentCode;
|
| 136 |
+
if (empty($paymentTitle)) {
|
| 137 |
+
$paymentType->title = $paymentCode;
|
| 138 |
+
} else {
|
| 139 |
+
$paymentType->title = $paymentTitle;
|
| 140 |
+
}
|
| 141 |
+
$status = $paymentModel->canUseCheckout();
|
| 142 |
+
if ($status == 1 && $paymentCode != 'free') {
|
| 143 |
+
$paymentType->active = true;
|
| 144 |
+
} else {
|
| 145 |
+
$paymentType->active = false;
|
| 146 |
+
}
|
| 147 |
+
$paymentTypes[] = $paymentType;
|
| 148 |
+
}
|
| 149 |
+
}
|
| 150 |
+
return $paymentTypes;
|
| 151 |
+
}
|
| 152 |
+
|
| 153 |
+
private function getCustomerGroups() {
|
| 154 |
+
$customerGroups = array();
|
| 155 |
+
$dbConnection = Mage::getSingleton('core/resource')->getConnection('core_read');
|
| 156 |
+
$sQuery = "SELECT customer_group_id, customer_group_code FROM ".$dbConnection->quoteIdentifier(Mage::getSingleton('core/resource')->getTableName('customer/customer_group'));
|
| 157 |
+
try {
|
| 158 |
+
$sResult = $dbConnection->fetchAll($sQuery);
|
| 159 |
+
foreach ($sResult AS $resultType) {
|
| 160 |
+
$customerGroup = new CPCustomerGroupType();
|
| 161 |
+
$customerGroup->id = $resultType['customer_group_id'];
|
| 162 |
+
$customerGroup->title = $resultType['customer_group_code'];
|
| 163 |
+
$customerGroup->active = true;
|
| 164 |
+
$customerGroups[] = $customerGroup;
|
| 165 |
+
}
|
| 166 |
+
$dbConnection->closeConnection();
|
| 167 |
+
} catch (Exception $e) {
|
| 168 |
+
$dbConnection->closeConnection();
|
| 169 |
+
CPErrorHandler::handle(CPResultCodes::SYSTEM_ERROR, "Exception during register Shop: " . $e->getMessage(), "Exception during register Shop: '$sQuery'\n" . $e->getMessage());
|
| 170 |
+
}
|
| 171 |
+
return $customerGroups;
|
| 172 |
+
}
|
| 173 |
+
|
| 174 |
+
}
|
| 175 |
+
|
| 176 |
+
?>
|
|
|
app/code/community/Channelpilotsolutions/Channelpilot/Model/Carrier/Cpshipping.php
ADDED
|
@@ -0,0 +1,77 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
/**
|
| 4 |
+
*
|
| 5 |
+
* NOTICE OF LICENSE
|
| 6 |
+
*
|
| 7 |
+
* This source file is subject to the GNU General Public License (GPL 3)
|
| 8 |
+
* that is bundled with this package in the file LICENSE.txt
|
| 9 |
+
*
|
| 10 |
+
* DISCLAIMER
|
| 11 |
+
*
|
| 12 |
+
* Do not edit or add to this file if you wish to upgrade Channelpilotsolutions_Channelpilot to newer
|
| 13 |
+
* versions in the future. If you wish to customize Channelpilotsolutions_Channelpilot for your
|
| 14 |
+
* needs please refer to http://www.channelpilot.com for more information.
|
| 15 |
+
*
|
| 16 |
+
* @category Channelpilotsolutions
|
| 17 |
+
* @package Channelpilotsolutions_Channelpilot
|
| 18 |
+
* @copyright Copyright (c) 2012 <info@channelpilot.com> - www.channelpilot.com
|
| 19 |
+
* @author Bj�rn Wehner <info@channelpilot.com>
|
| 20 |
+
* @license <http://www.gnu.org/licenses/> GNU General Public License (GPL 3)
|
| 21 |
+
* @link http://www.channelpilot.com
|
| 22 |
+
*/
|
| 23 |
+
class Channelpilotsolutions_Channelpilot_Model_Carrier_Cpshipping
|
| 24 |
+
extends Mage_Shipping_Model_Carrier_Abstract
|
| 25 |
+
implements Mage_Shipping_Model_Carrier_Interface
|
| 26 |
+
{
|
| 27 |
+
protected $_code = 'cpshipping';
|
| 28 |
+
protected $_isFixed = true;
|
| 29 |
+
|
| 30 |
+
/**
|
| 31 |
+
* Checks if user is logged in as admin
|
| 32 |
+
*
|
| 33 |
+
* @return bool
|
| 34 |
+
*/
|
| 35 |
+
protected function isAdmin() {
|
| 36 |
+
$token = Mage::app()->getRequest()->getParam('token', false);
|
| 37 |
+
if($token) {
|
| 38 |
+
if(CPAbstractHandler::isIpAllowedViaSecurityToken($token)) {
|
| 39 |
+
return true;
|
| 40 |
+
}
|
| 41 |
+
}
|
| 42 |
+
/* set admin session */
|
| 43 |
+
Mage::getSingleton('core/session', array('name' => 'adminhtml'))->start();
|
| 44 |
+
$isLoggedIn = Mage::getSingleton('admin/session', array('name' => 'adminhtml'))->isLoggedIn();
|
| 45 |
+
/* set original session */
|
| 46 |
+
Mage::log($this->_sessionNamespace);
|
| 47 |
+
Mage::getSingleton('core/session', array('name' => $this->_sessionNamespace))->start();
|
| 48 |
+
return $isLoggedIn;
|
| 49 |
+
}
|
| 50 |
+
|
| 51 |
+
/**
|
| 52 |
+
* Returns the shipping rate for 'cpfreebackendshipping'.
|
| 53 |
+
*
|
| 54 |
+
* @param Mage_Shipping_Model_Rate_Request $request
|
| 55 |
+
* @return Mage_Shipping_Model_Rate_Result
|
| 56 |
+
*/
|
| 57 |
+
public function collectRates(Mage_Shipping_Model_Rate_Request $request) {
|
| 58 |
+
if ($this->getConfigFlag('backend_only') && (!$this->getConfigFlag('active') || !$this->isAdmin())) {
|
| 59 |
+
return false;
|
| 60 |
+
}
|
| 61 |
+
|
| 62 |
+
$method = Mage::getModel('shipping/rate_result_method')
|
| 63 |
+
->setCarrier('cpshipping')
|
| 64 |
+
->setCarrierTitle($this->getConfigData('title'))
|
| 65 |
+
->setMethod('cpshipping')
|
| 66 |
+
->setMethodTitle($this->getConfigData('name'))
|
| 67 |
+
->setPrice($this->getConfigData('price'))
|
| 68 |
+
->setCost($this->getConfigData('price'));
|
| 69 |
+
|
| 70 |
+
return Mage::getModel('shipping/rate_result')
|
| 71 |
+
->append($method);
|
| 72 |
+
}
|
| 73 |
+
|
| 74 |
+
public function getAllowedMethods() {
|
| 75 |
+
return array('cpshipping'=>$this->getConfigData('name'));
|
| 76 |
+
}
|
| 77 |
+
}
|
app/code/community/Channelpilotsolutions/Channelpilot/etc/config.xml
CHANGED
|
@@ -24,7 +24,7 @@
|
|
| 24 |
<config>
|
| 25 |
<modules>
|
| 26 |
<Channelpilotsolutions_Channelpilot>
|
| 27 |
-
<version>2.1.
|
| 28 |
</Channelpilotsolutions_Channelpilot>
|
| 29 |
</modules>
|
| 30 |
<global>
|
|
@@ -61,7 +61,7 @@
|
|
| 61 |
<connection>
|
| 62 |
<charset>utf8</charset>
|
| 63 |
</connection>
|
| 64 |
-
</default_setup>
|
| 65 |
<channelpilot_setup>
|
| 66 |
<setup>
|
| 67 |
<module>Channelpilotsolutions_Channelpilot</module>
|
|
@@ -83,7 +83,7 @@
|
|
| 83 |
<class>Channelpilotsolutions_Channelpilot_Helper</class>
|
| 84 |
</channelpilot>
|
| 85 |
</helpers>
|
| 86 |
-
</global>
|
| 87 |
<adminhtml>
|
| 88 |
<translate>
|
| 89 |
<modules>
|
|
@@ -111,7 +111,7 @@
|
|
| 111 |
<frontName>channelpilot</frontName>
|
| 112 |
</args>
|
| 113 |
</channelpilot>
|
| 114 |
-
</routers>
|
| 115 |
<layout>
|
| 116 |
<updates>
|
| 117 |
<channelpilotsolutions_channelpilot>
|
|
@@ -129,8 +129,20 @@
|
|
| 129 |
<payment_action>authorize</payment_action>
|
| 130 |
<allowspecific>0</allowspecific>
|
| 131 |
<email_customer>0</email_customer>
|
| 132 |
-
<title>ChannelPilot Marketplace Payment</title>
|
| 133 |
</cp_mp>
|
| 134 |
</payment>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 135 |
</default>
|
| 136 |
</config>
|
| 24 |
<config>
|
| 25 |
<modules>
|
| 26 |
<Channelpilotsolutions_Channelpilot>
|
| 27 |
+
<version>2.1.5</version>
|
| 28 |
</Channelpilotsolutions_Channelpilot>
|
| 29 |
</modules>
|
| 30 |
<global>
|
| 61 |
<connection>
|
| 62 |
<charset>utf8</charset>
|
| 63 |
</connection>
|
| 64 |
+
</default_setup>
|
| 65 |
<channelpilot_setup>
|
| 66 |
<setup>
|
| 67 |
<module>Channelpilotsolutions_Channelpilot</module>
|
| 83 |
<class>Channelpilotsolutions_Channelpilot_Helper</class>
|
| 84 |
</channelpilot>
|
| 85 |
</helpers>
|
| 86 |
+
</global>
|
| 87 |
<adminhtml>
|
| 88 |
<translate>
|
| 89 |
<modules>
|
| 111 |
<frontName>channelpilot</frontName>
|
| 112 |
</args>
|
| 113 |
</channelpilot>
|
| 114 |
+
</routers>
|
| 115 |
<layout>
|
| 116 |
<updates>
|
| 117 |
<channelpilotsolutions_channelpilot>
|
| 129 |
<payment_action>authorize</payment_action>
|
| 130 |
<allowspecific>0</allowspecific>
|
| 131 |
<email_customer>0</email_customer>
|
| 132 |
+
<title>ChannelPilot Marketplace Payment</title>
|
| 133 |
</cp_mp>
|
| 134 |
</payment>
|
| 135 |
+
<carriers>
|
| 136 |
+
<cpshipping>
|
| 137 |
+
<active>1</active>
|
| 138 |
+
<backend_only>1</backend_only>
|
| 139 |
+
<price>0.0</price>
|
| 140 |
+
<sallowspecific>0</sallowspecific>
|
| 141 |
+
<model>channelpilot/carrier_cpshipping</model>
|
| 142 |
+
<name>ChannelPilot Shipping</name>
|
| 143 |
+
<title>ChannelPilot Shipping</title>
|
| 144 |
+
<specificerrmsg>This shipping method is currently unavailable.</specificerrmsg>
|
| 145 |
+
</cpshipping>
|
| 146 |
+
</carriers>
|
| 147 |
</default>
|
| 148 |
</config>
|
app/code/community/Channelpilotsolutions/Channelpilot/etc/system.xml
CHANGED
|
@@ -63,7 +63,7 @@
|
|
| 63 |
<sort_order>1</sort_order>
|
| 64 |
<show_in_default>1</show_in_default>
|
| 65 |
<show_in_website>1</show_in_website>
|
| 66 |
-
<show_in_store>1</show_in_store>
|
| 67 |
</channelpilot_useNews>
|
| 68 |
<channelpilot_checkIp>
|
| 69 |
<label>CP Should the IP for API access be checked?</label>
|
|
@@ -72,7 +72,7 @@
|
|
| 72 |
<sort_order>2</sort_order>
|
| 73 |
<show_in_default>1</show_in_default>
|
| 74 |
<show_in_website>1</show_in_website>
|
| 75 |
-
<show_in_store>1</show_in_store>
|
| 76 |
</channelpilot_checkIp>
|
| 77 |
<channelpilot_articlenumber>
|
| 78 |
<label>CP Articlenumber</label>
|
|
@@ -82,11 +82,11 @@
|
|
| 82 |
<sort_order>3</sort_order>
|
| 83 |
<show_in_default>1</show_in_default>
|
| 84 |
<show_in_website>1</show_in_website>
|
| 85 |
-
<show_in_store>1</show_in_store>
|
| 86 |
</channelpilot_articlenumber>
|
| 87 |
</fields>
|
| 88 |
</channelpilot_general>
|
| 89 |
-
</groups>
|
| 90 |
</channelpilot_general>
|
| 91 |
<channelpilot_tracking translate="label" module="channelpilot">
|
| 92 |
<label>CP Tracking</label>
|
|
@@ -120,7 +120,7 @@
|
|
| 120 |
<sort_order>0</sort_order>
|
| 121 |
<show_in_default>1</show_in_default>
|
| 122 |
<show_in_website>1</show_in_website>
|
| 123 |
-
<show_in_store>1</show_in_store>
|
| 124 |
</channelpilot_useTracking>
|
| 125 |
<channelpilot_cookiemode>
|
| 126 |
<label>CP Cookiemode</label>
|
|
@@ -129,7 +129,7 @@
|
|
| 129 |
<sort_order>1</sort_order>
|
| 130 |
<show_in_default>1</show_in_default>
|
| 131 |
<show_in_website>1</show_in_website>
|
| 132 |
-
<show_in_store>1</show_in_store>
|
| 133 |
</channelpilot_cookiemode>
|
| 134 |
<channelpilot_trackingkeys>
|
| 135 |
<label>CP Trackingkeys</label>
|
|
@@ -142,7 +142,7 @@
|
|
| 142 |
</channelpilot_trackingkeys>
|
| 143 |
</fields>
|
| 144 |
</channelpilot_tracking>
|
| 145 |
-
</groups>
|
| 146 |
</channelpilot_tracking>
|
| 147 |
<channelpilot_export translate="label" module="channelpilot">
|
| 148 |
<label>CP Data Feed Export</label>
|
|
@@ -176,7 +176,7 @@
|
|
| 176 |
<sort_order>0</sort_order>
|
| 177 |
<show_in_default>1</show_in_default>
|
| 178 |
<show_in_website>1</show_in_website>
|
| 179 |
-
<show_in_store>1</show_in_store>
|
| 180 |
</channelpilot_useExport>
|
| 181 |
<channelpilot_password translate="label">
|
| 182 |
<label>CP Password</label>
|
|
@@ -225,11 +225,11 @@
|
|
| 225 |
<sort_order>5</sort_order>
|
| 226 |
<show_in_default>1</show_in_default>
|
| 227 |
<show_in_website>1</show_in_website>
|
| 228 |
-
<show_in_store>1</show_in_store>
|
| 229 |
</channelpilot_imagenumber>
|
| 230 |
</fields>
|
| 231 |
</channelpilot_productfeed>
|
| 232 |
-
</groups>
|
| 233 |
</channelpilot_export>
|
| 234 |
<channelpilot_marketplace translate="label" module="channelpilot">
|
| 235 |
<label>CP Marketplace Integration</label>
|
|
@@ -263,7 +263,7 @@
|
|
| 263 |
<sort_order>0</sort_order>
|
| 264 |
<show_in_default>1</show_in_default>
|
| 265 |
<show_in_website>1</show_in_website>
|
| 266 |
-
<show_in_store>1</show_in_store>
|
| 267 |
</channelpilot_useMarketplaces>
|
| 268 |
<channelpilot_orderStatusImportedPayed>
|
| 269 |
<label>CP OrderStatus Imported (payed)?</label>
|
|
@@ -272,7 +272,7 @@
|
|
| 272 |
<sort_order>1</sort_order>
|
| 273 |
<show_in_default>1</show_in_default>
|
| 274 |
<show_in_website>1</show_in_website>
|
| 275 |
-
<show_in_store>1</show_in_store>
|
| 276 |
</channelpilot_orderStatusImportedPayed>
|
| 277 |
<channelpilot_orderStatusImportedUnpayed>
|
| 278 |
<label>CP OrderStatus Imported (unpayed)?</label>
|
|
@@ -281,7 +281,7 @@
|
|
| 281 |
<sort_order>2</sort_order>
|
| 282 |
<show_in_default>1</show_in_default>
|
| 283 |
<show_in_website>1</show_in_website>
|
| 284 |
-
<show_in_store>1</show_in_store>
|
| 285 |
</channelpilot_orderStatusImportedUnpayed>
|
| 286 |
<!-- <channelpilot_orderStatusPayed>
|
| 287 |
<label>CP OrderStatus Payed?</label>
|
|
@@ -290,7 +290,7 @@
|
|
| 290 |
<sort_order>3</sort_order>
|
| 291 |
<show_in_default>1</show_in_default>
|
| 292 |
<show_in_website>1</show_in_website>
|
| 293 |
-
<show_in_store>1</show_in_store>
|
| 294 |
</channelpilot_orderStatusPayed>
|
| 295 |
<channelpilot_orderStatusCancelled>
|
| 296 |
<label>CP OrderStatus Cancelled?</label>
|
|
@@ -299,7 +299,7 @@
|
|
| 299 |
<sort_order>4</sort_order>
|
| 300 |
<show_in_default>1</show_in_default>
|
| 301 |
<show_in_website>1</show_in_website>
|
| 302 |
-
<show_in_store>1</show_in_store>
|
| 303 |
</channelpilot_orderStatusCancelled>
|
| 304 |
<channelpilot_orderStatusDeliveried>
|
| 305 |
<label>CP OrderStatus Deliveried?</label>
|
|
@@ -308,11 +308,11 @@
|
|
| 308 |
<sort_order>5</sort_order>
|
| 309 |
<show_in_default>1</show_in_default>
|
| 310 |
<show_in_website>1</show_in_website>
|
| 311 |
-
<show_in_store>1</show_in_store>
|
| 312 |
</channelpilot_orderStatusDeliveried>-->
|
| 313 |
</fields>
|
| 314 |
</channelpilot_marketplace>
|
| 315 |
-
</groups>
|
| 316 |
</channelpilot_marketplace>
|
| 317 |
<channelpilot_pricecontrol translate="label" module="channelpilot">
|
| 318 |
<label>CP Repricing</label>
|
|
@@ -346,7 +346,7 @@
|
|
| 346 |
<sort_order>0</sort_order>
|
| 347 |
<show_in_default>1</show_in_default>
|
| 348 |
<show_in_website>1</show_in_website>
|
| 349 |
-
<show_in_store>1</show_in_store>
|
| 350 |
</channelpilot_usePricecontrol>
|
| 351 |
<channelpilot_saveGrossOrNetPrices>
|
| 352 |
<label>CP Save prices net or gross?</label>
|
|
@@ -355,9 +355,9 @@
|
|
| 355 |
<sort_order>1</sort_order>
|
| 356 |
<show_in_default>1</show_in_default>
|
| 357 |
<show_in_website>1</show_in_website>
|
| 358 |
-
<show_in_store>1</show_in_store>
|
| 359 |
</channelpilot_saveGrossOrNetPrices>
|
| 360 |
-
</fields>
|
| 361 |
</channelpilot_general>
|
| 362 |
<general_prices translate="label">
|
| 363 |
<label>CP General Repricing</label>
|
|
@@ -375,7 +375,7 @@
|
|
| 375 |
<sort_order>0</sort_order>
|
| 376 |
<show_in_default>1</show_in_default>
|
| 377 |
<show_in_website>1</show_in_website>
|
| 378 |
-
<show_in_store>1</show_in_store>
|
| 379 |
</channelpilot_usePricecontrol>-->
|
| 380 |
<channelpilot_generalPriceField>
|
| 381 |
<label>CP Field for price</label>
|
|
@@ -385,7 +385,7 @@
|
|
| 385 |
<sort_order>1</sort_order>
|
| 386 |
<show_in_default>1</show_in_default>
|
| 387 |
<show_in_website>1</show_in_website>
|
| 388 |
-
<show_in_store>1</show_in_store>
|
| 389 |
</channelpilot_generalPriceField>
|
| 390 |
</fields>
|
| 391 |
</general_prices>
|
|
@@ -404,11 +404,11 @@
|
|
| 404 |
<sort_order>0</sort_order>
|
| 405 |
<show_in_default>1</show_in_default>
|
| 406 |
<show_in_website>1</show_in_website>
|
| 407 |
-
<show_in_store>1</show_in_store>
|
| 408 |
</channelpilot_usePricecontrol>
|
| 409 |
</fields>
|
| 410 |
</campaign_prices>-->
|
| 411 |
-
</groups>
|
| 412 |
</channelpilot_pricecontrol>
|
| 413 |
<payment>
|
| 414 |
<groups>
|
|
@@ -461,5 +461,107 @@
|
|
| 461 |
</cp_mp>
|
| 462 |
</groups>
|
| 463 |
</payment>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 464 |
</sections>
|
| 465 |
</config>
|
| 63 |
<sort_order>1</sort_order>
|
| 64 |
<show_in_default>1</show_in_default>
|
| 65 |
<show_in_website>1</show_in_website>
|
| 66 |
+
<show_in_store>1</show_in_store>
|
| 67 |
</channelpilot_useNews>
|
| 68 |
<channelpilot_checkIp>
|
| 69 |
<label>CP Should the IP for API access be checked?</label>
|
| 72 |
<sort_order>2</sort_order>
|
| 73 |
<show_in_default>1</show_in_default>
|
| 74 |
<show_in_website>1</show_in_website>
|
| 75 |
+
<show_in_store>1</show_in_store>
|
| 76 |
</channelpilot_checkIp>
|
| 77 |
<channelpilot_articlenumber>
|
| 78 |
<label>CP Articlenumber</label>
|
| 82 |
<sort_order>3</sort_order>
|
| 83 |
<show_in_default>1</show_in_default>
|
| 84 |
<show_in_website>1</show_in_website>
|
| 85 |
+
<show_in_store>1</show_in_store>
|
| 86 |
</channelpilot_articlenumber>
|
| 87 |
</fields>
|
| 88 |
</channelpilot_general>
|
| 89 |
+
</groups>
|
| 90 |
</channelpilot_general>
|
| 91 |
<channelpilot_tracking translate="label" module="channelpilot">
|
| 92 |
<label>CP Tracking</label>
|
| 120 |
<sort_order>0</sort_order>
|
| 121 |
<show_in_default>1</show_in_default>
|
| 122 |
<show_in_website>1</show_in_website>
|
| 123 |
+
<show_in_store>1</show_in_store>
|
| 124 |
</channelpilot_useTracking>
|
| 125 |
<channelpilot_cookiemode>
|
| 126 |
<label>CP Cookiemode</label>
|
| 129 |
<sort_order>1</sort_order>
|
| 130 |
<show_in_default>1</show_in_default>
|
| 131 |
<show_in_website>1</show_in_website>
|
| 132 |
+
<show_in_store>1</show_in_store>
|
| 133 |
</channelpilot_cookiemode>
|
| 134 |
<channelpilot_trackingkeys>
|
| 135 |
<label>CP Trackingkeys</label>
|
| 142 |
</channelpilot_trackingkeys>
|
| 143 |
</fields>
|
| 144 |
</channelpilot_tracking>
|
| 145 |
+
</groups>
|
| 146 |
</channelpilot_tracking>
|
| 147 |
<channelpilot_export translate="label" module="channelpilot">
|
| 148 |
<label>CP Data Feed Export</label>
|
| 176 |
<sort_order>0</sort_order>
|
| 177 |
<show_in_default>1</show_in_default>
|
| 178 |
<show_in_website>1</show_in_website>
|
| 179 |
+
<show_in_store>1</show_in_store>
|
| 180 |
</channelpilot_useExport>
|
| 181 |
<channelpilot_password translate="label">
|
| 182 |
<label>CP Password</label>
|
| 225 |
<sort_order>5</sort_order>
|
| 226 |
<show_in_default>1</show_in_default>
|
| 227 |
<show_in_website>1</show_in_website>
|
| 228 |
+
<show_in_store>1</show_in_store>
|
| 229 |
</channelpilot_imagenumber>
|
| 230 |
</fields>
|
| 231 |
</channelpilot_productfeed>
|
| 232 |
+
</groups>
|
| 233 |
</channelpilot_export>
|
| 234 |
<channelpilot_marketplace translate="label" module="channelpilot">
|
| 235 |
<label>CP Marketplace Integration</label>
|
| 263 |
<sort_order>0</sort_order>
|
| 264 |
<show_in_default>1</show_in_default>
|
| 265 |
<show_in_website>1</show_in_website>
|
| 266 |
+
<show_in_store>1</show_in_store>
|
| 267 |
</channelpilot_useMarketplaces>
|
| 268 |
<channelpilot_orderStatusImportedPayed>
|
| 269 |
<label>CP OrderStatus Imported (payed)?</label>
|
| 272 |
<sort_order>1</sort_order>
|
| 273 |
<show_in_default>1</show_in_default>
|
| 274 |
<show_in_website>1</show_in_website>
|
| 275 |
+
<show_in_store>1</show_in_store>
|
| 276 |
</channelpilot_orderStatusImportedPayed>
|
| 277 |
<channelpilot_orderStatusImportedUnpayed>
|
| 278 |
<label>CP OrderStatus Imported (unpayed)?</label>
|
| 281 |
<sort_order>2</sort_order>
|
| 282 |
<show_in_default>1</show_in_default>
|
| 283 |
<show_in_website>1</show_in_website>
|
| 284 |
+
<show_in_store>1</show_in_store>
|
| 285 |
</channelpilot_orderStatusImportedUnpayed>
|
| 286 |
<!-- <channelpilot_orderStatusPayed>
|
| 287 |
<label>CP OrderStatus Payed?</label>
|
| 290 |
<sort_order>3</sort_order>
|
| 291 |
<show_in_default>1</show_in_default>
|
| 292 |
<show_in_website>1</show_in_website>
|
| 293 |
+
<show_in_store>1</show_in_store>
|
| 294 |
</channelpilot_orderStatusPayed>
|
| 295 |
<channelpilot_orderStatusCancelled>
|
| 296 |
<label>CP OrderStatus Cancelled?</label>
|
| 299 |
<sort_order>4</sort_order>
|
| 300 |
<show_in_default>1</show_in_default>
|
| 301 |
<show_in_website>1</show_in_website>
|
| 302 |
+
<show_in_store>1</show_in_store>
|
| 303 |
</channelpilot_orderStatusCancelled>
|
| 304 |
<channelpilot_orderStatusDeliveried>
|
| 305 |
<label>CP OrderStatus Deliveried?</label>
|
| 308 |
<sort_order>5</sort_order>
|
| 309 |
<show_in_default>1</show_in_default>
|
| 310 |
<show_in_website>1</show_in_website>
|
| 311 |
+
<show_in_store>1</show_in_store>
|
| 312 |
</channelpilot_orderStatusDeliveried>-->
|
| 313 |
</fields>
|
| 314 |
</channelpilot_marketplace>
|
| 315 |
+
</groups>
|
| 316 |
</channelpilot_marketplace>
|
| 317 |
<channelpilot_pricecontrol translate="label" module="channelpilot">
|
| 318 |
<label>CP Repricing</label>
|
| 346 |
<sort_order>0</sort_order>
|
| 347 |
<show_in_default>1</show_in_default>
|
| 348 |
<show_in_website>1</show_in_website>
|
| 349 |
+
<show_in_store>1</show_in_store>
|
| 350 |
</channelpilot_usePricecontrol>
|
| 351 |
<channelpilot_saveGrossOrNetPrices>
|
| 352 |
<label>CP Save prices net or gross?</label>
|
| 355 |
<sort_order>1</sort_order>
|
| 356 |
<show_in_default>1</show_in_default>
|
| 357 |
<show_in_website>1</show_in_website>
|
| 358 |
+
<show_in_store>1</show_in_store>
|
| 359 |
</channelpilot_saveGrossOrNetPrices>
|
| 360 |
+
</fields>
|
| 361 |
</channelpilot_general>
|
| 362 |
<general_prices translate="label">
|
| 363 |
<label>CP General Repricing</label>
|
| 375 |
<sort_order>0</sort_order>
|
| 376 |
<show_in_default>1</show_in_default>
|
| 377 |
<show_in_website>1</show_in_website>
|
| 378 |
+
<show_in_store>1</show_in_store>
|
| 379 |
</channelpilot_usePricecontrol>-->
|
| 380 |
<channelpilot_generalPriceField>
|
| 381 |
<label>CP Field for price</label>
|
| 385 |
<sort_order>1</sort_order>
|
| 386 |
<show_in_default>1</show_in_default>
|
| 387 |
<show_in_website>1</show_in_website>
|
| 388 |
+
<show_in_store>1</show_in_store>
|
| 389 |
</channelpilot_generalPriceField>
|
| 390 |
</fields>
|
| 391 |
</general_prices>
|
| 404 |
<sort_order>0</sort_order>
|
| 405 |
<show_in_default>1</show_in_default>
|
| 406 |
<show_in_website>1</show_in_website>
|
| 407 |
+
<show_in_store>1</show_in_store>
|
| 408 |
</channelpilot_usePricecontrol>
|
| 409 |
</fields>
|
| 410 |
</campaign_prices>-->
|
| 411 |
+
</groups>
|
| 412 |
</channelpilot_pricecontrol>
|
| 413 |
<payment>
|
| 414 |
<groups>
|
| 461 |
</cp_mp>
|
| 462 |
</groups>
|
| 463 |
</payment>
|
| 464 |
+
<carriers>
|
| 465 |
+
<groups>
|
| 466 |
+
<cpshipping translate="label">
|
| 467 |
+
<label>CP Channelpilot - Shipping Method</label>
|
| 468 |
+
<frontend_type>text</frontend_type>
|
| 469 |
+
<sort_order>50</sort_order>
|
| 470 |
+
<show_in_default>1</show_in_default>
|
| 471 |
+
<show_in_website>1</show_in_website>
|
| 472 |
+
<show_in_store>1</show_in_store>
|
| 473 |
+
<fields>
|
| 474 |
+
<active translate="label">
|
| 475 |
+
<label>CP Enabled</label>
|
| 476 |
+
<frontend_type>select</frontend_type>
|
| 477 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 478 |
+
<sort_order>10</sort_order>
|
| 479 |
+
<show_in_default>1</show_in_default>
|
| 480 |
+
<show_in_website>1</show_in_website>
|
| 481 |
+
<show_in_store>1</show_in_store>
|
| 482 |
+
</active>
|
| 483 |
+
<backend_only translate="label">
|
| 484 |
+
<label>CP Use for backend only</label>
|
| 485 |
+
<frontend_type>select</frontend_type>
|
| 486 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 487 |
+
<sort_order>15</sort_order>
|
| 488 |
+
<show_in_default>1</show_in_default>
|
| 489 |
+
<show_in_website>1</show_in_website>
|
| 490 |
+
<show_in_store>1</show_in_store>
|
| 491 |
+
</backend_only>
|
| 492 |
+
<title translate="label">
|
| 493 |
+
<label>CP Title</label>
|
| 494 |
+
<frontend_type>text</frontend_type>
|
| 495 |
+
<sort_order>20</sort_order>
|
| 496 |
+
<show_in_default>1</show_in_default>
|
| 497 |
+
<show_in_website>1</show_in_website>
|
| 498 |
+
<show_in_store>1</show_in_store>
|
| 499 |
+
</title>
|
| 500 |
+
<name translate="label">
|
| 501 |
+
<label>CP Method Name</label>
|
| 502 |
+
<frontend_type>text</frontend_type>
|
| 503 |
+
<sort_order>30</sort_order>
|
| 504 |
+
<show_in_default>1</show_in_default>
|
| 505 |
+
<show_in_website>1</show_in_website>
|
| 506 |
+
<show_in_store>1</show_in_store>
|
| 507 |
+
</name>
|
| 508 |
+
<price translate="label">
|
| 509 |
+
<label>CP Price</label>
|
| 510 |
+
<frontend_type>text</frontend_type>
|
| 511 |
+
<validate>validate-number validate-zero-or-greater input-text</validate>
|
| 512 |
+
<sort_order>35</sort_order>
|
| 513 |
+
<show_in_default>1</show_in_default>
|
| 514 |
+
<show_in_website>1</show_in_website>
|
| 515 |
+
<show_in_store>1</show_in_store>
|
| 516 |
+
</price>
|
| 517 |
+
<sallowspecific translate="label">
|
| 518 |
+
<label>CP Ship to Applicable Countries</label>
|
| 519 |
+
<frontend_type>select</frontend_type>
|
| 520 |
+
<sort_order>40</sort_order>
|
| 521 |
+
<frontend_class>shipping-applicable-country</frontend_class>
|
| 522 |
+
<source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
|
| 523 |
+
<show_in_default>1</show_in_default>
|
| 524 |
+
<show_in_website>1</show_in_website>
|
| 525 |
+
<show_in_store>1</show_in_store>
|
| 526 |
+
</sallowspecific>
|
| 527 |
+
<showmethod translate="label">
|
| 528 |
+
<label>CP Show Method if Not Applicable</label>
|
| 529 |
+
<frontend_type>select</frontend_type>
|
| 530 |
+
<sort_order>41</sort_order>
|
| 531 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 532 |
+
<show_in_default>1</show_in_default>
|
| 533 |
+
<show_in_website>1</show_in_website>
|
| 534 |
+
<show_in_store>1</show_in_store>
|
| 535 |
+
</showmethod>
|
| 536 |
+
<specificcountry translate="label">
|
| 537 |
+
<label>CP Ship to Specific Countries</label>
|
| 538 |
+
<frontend_type>multiselect</frontend_type>
|
| 539 |
+
<sort_order>42</sort_order>
|
| 540 |
+
<source_model>adminhtml/system_config_source_country</source_model>
|
| 541 |
+
<show_in_default>1</show_in_default>
|
| 542 |
+
<show_in_website>1</show_in_website>
|
| 543 |
+
<show_in_store>1</show_in_store>
|
| 544 |
+
<can_be_empty>1</can_be_empty>
|
| 545 |
+
</specificcountry>
|
| 546 |
+
<specificerrmsg translate="label">
|
| 547 |
+
<label>CP Displayed Error Message</label>
|
| 548 |
+
<frontend_type>textarea</frontend_type>
|
| 549 |
+
<sort_order>43</sort_order>
|
| 550 |
+
<show_in_default>1</show_in_default>
|
| 551 |
+
<show_in_website>1</show_in_website>
|
| 552 |
+
<show_in_store>1</show_in_store>
|
| 553 |
+
</specificerrmsg>
|
| 554 |
+
<sort_order translate="label">
|
| 555 |
+
<label>CP Sort Order</label>
|
| 556 |
+
<frontend_type>text</frontend_type>
|
| 557 |
+
<sort_order>50</sort_order>
|
| 558 |
+
<show_in_default>1</show_in_default>
|
| 559 |
+
<show_in_website>1</show_in_website>
|
| 560 |
+
<show_in_store>1</show_in_store>
|
| 561 |
+
</sort_order>
|
| 562 |
+
</fields>
|
| 563 |
+
</cpshipping>
|
| 564 |
+
</groups>
|
| 565 |
+
</carriers>
|
| 566 |
</sections>
|
| 567 |
</config>
|
app/locale/de_AT/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -43,4 +43,17 @@
|
|
| 43 |
|
| 44 |
"CP Activate?","Aktivieren?"
|
| 45 |
"CP Add","Hinzufügen"
|
| 46 |
-
"CP Delete","Löschen"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
"CP Activate?","Aktivieren?"
|
| 45 |
"CP Add","Hinzufügen"
|
| 46 |
+
"CP Delete","Löschen"
|
| 47 |
+
|
| 48 |
+
"This shipping method is currently unavailable.","Diese Versandart ist derzeit nicht verfügbar."
|
| 49 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Versandmethode"
|
| 50 |
+
"CP Enabled","Aktiviert"
|
| 51 |
+
"CP Use for backend only","Nur im Backend-Bereich aktivieren"
|
| 52 |
+
"CP Title","Titel"
|
| 53 |
+
"CP Method Name","Name der Versandart"
|
| 54 |
+
"CP Price","Preis"
|
| 55 |
+
"CP Ship to Applicable Countries","Versand an verfügbare Länder"
|
| 56 |
+
"CP Show Method if Not Applicable","Versandart anzeigen wenn diese nicht verfügbar ist"
|
| 57 |
+
"CP Ship to Specific Countries","Versand nur in folgende Länder"
|
| 58 |
+
"CP Displayed Error Message","Angezeigte Fehlermeldung"
|
| 59 |
+
"CP Sort Order","Sortierreihenfolge"
|
app/locale/de_CH/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -43,4 +43,17 @@
|
|
| 43 |
|
| 44 |
"CP Activate?","Aktivieren?"
|
| 45 |
"CP Add","Hinzufügen"
|
| 46 |
-
"CP Delete","Löschen"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
"CP Activate?","Aktivieren?"
|
| 45 |
"CP Add","Hinzufügen"
|
| 46 |
+
"CP Delete","Löschen"
|
| 47 |
+
|
| 48 |
+
"This shipping method is currently unavailable.","Diese Versandart ist derzeit nicht verfügbar."
|
| 49 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Versandmethode"
|
| 50 |
+
"CP Enabled","Aktiviert"
|
| 51 |
+
"CP Use for backend only","Nur im Backend-Bereich aktivieren"
|
| 52 |
+
"CP Title","Titel"
|
| 53 |
+
"CP Method Name","Name der Versandart"
|
| 54 |
+
"CP Price","Preis"
|
| 55 |
+
"CP Ship to Applicable Countries","Versand an verfügbare Länder"
|
| 56 |
+
"CP Show Method if Not Applicable","Versandart anzeigen wenn diese nicht verfügbar ist"
|
| 57 |
+
"CP Ship to Specific Countries","Versand nur in folgende Länder"
|
| 58 |
+
"CP Displayed Error Message","Angezeigte Fehlermeldung"
|
| 59 |
+
"CP Sort Order","Sortierreihenfolge"
|
app/locale/de_DE/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -45,4 +45,17 @@
|
|
| 45 |
|
| 46 |
"CP Activate?","Aktivieren?"
|
| 47 |
"CP Add","Hinzufügen"
|
| 48 |
-
"CP Delete","Löschen"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 45 |
|
| 46 |
"CP Activate?","Aktivieren?"
|
| 47 |
"CP Add","Hinzufügen"
|
| 48 |
+
"CP Delete","Löschen"
|
| 49 |
+
|
| 50 |
+
"This shipping method is currently unavailable.","Diese Versandart ist derzeit nicht verfügbar."
|
| 51 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Versandmethode"
|
| 52 |
+
"CP Enabled","Aktiviert"
|
| 53 |
+
"CP Use for backend only","Nur im Backend-Bereich aktivieren"
|
| 54 |
+
"CP Title","Titel"
|
| 55 |
+
"CP Method Name","Name der Versandart"
|
| 56 |
+
"CP Price","Preis"
|
| 57 |
+
"CP Ship to Applicable Countries","Versand an verfügbare Länder"
|
| 58 |
+
"CP Show Method if Not Applicable","Versandart anzeigen wenn diese nicht verfügbar ist"
|
| 59 |
+
"CP Ship to Specific Countries","Versand nur in folgende Länder"
|
| 60 |
+
"CP Displayed Error Message","Angezeigte Fehlermeldung"
|
| 61 |
+
"CP Sort Order","Sortierreihenfolge"
|
app/locale/en_AU/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -43,4 +43,17 @@
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
-
"CP Delete","Delete"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
+
"CP Delete","Delete"
|
| 47 |
+
|
| 48 |
+
"This shipping method is currently unavailable.","This shipping method is currently unavailable."
|
| 49 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Shipping Method"
|
| 50 |
+
"CP Enabled","Enabled"
|
| 51 |
+
"CP Use for backend only","Use for backend only"
|
| 52 |
+
"CP Title","Title"
|
| 53 |
+
"CP Method Name","Method Name"
|
| 54 |
+
"CP Price","Price"
|
| 55 |
+
"CP Ship to Applicable Countries","Ship to Applicable Countries"
|
| 56 |
+
"CP Show Method if Not Applicable","Show Method If Not Applicable"
|
| 57 |
+
"CP Ship to Specific Countries","Ship to Specific Countries"
|
| 58 |
+
"CP Displayed Error Message","Displayed Error Message"
|
| 59 |
+
"CP Sort Order","Sort Order"
|
app/locale/en_CA/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -43,4 +43,17 @@
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
-
"CP Delete","Delete"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
+
"CP Delete","Delete"
|
| 47 |
+
|
| 48 |
+
"This shipping method is currently unavailable.","This shipping method is currently unavailable."
|
| 49 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Shipping Method"
|
| 50 |
+
"CP Enabled","Enabled"
|
| 51 |
+
"CP Use for backend only","Use for backend only"
|
| 52 |
+
"CP Title","Title"
|
| 53 |
+
"CP Method Name","Method Name"
|
| 54 |
+
"CP Price","Price"
|
| 55 |
+
"CP Ship to Applicable Countries","Ship to Applicable Countries"
|
| 56 |
+
"CP Show Method if Not Applicable","Show Method If Not Applicable"
|
| 57 |
+
"CP Ship to Specific Countries","Ship to Specific Countries"
|
| 58 |
+
"CP Displayed Error Message","Displayed Error Message"
|
| 59 |
+
"CP Sort Order","Sort Order"
|
app/locale/en_GB/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -43,4 +43,17 @@
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
-
"CP Delete","Delete"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
+
"CP Delete","Delete"
|
| 47 |
+
|
| 48 |
+
"This shipping method is currently unavailable.","This shipping method is currently unavailable."
|
| 49 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Shipping Method"
|
| 50 |
+
"CP Enabled","Enabled"
|
| 51 |
+
"CP Use for backend only","Use for backend only"
|
| 52 |
+
"CP Title","Title"
|
| 53 |
+
"CP Method Name","Method Name"
|
| 54 |
+
"CP Price","Price"
|
| 55 |
+
"CP Ship to Applicable Countries","Ship to Applicable Countries"
|
| 56 |
+
"CP Show Method if Not Applicable","Show Method If Not Applicable"
|
| 57 |
+
"CP Ship to Specific Countries","Ship to Specific Countries"
|
| 58 |
+
"CP Displayed Error Message","Displayed Error Message"
|
| 59 |
+
"CP Sort Order","Sort Order"
|
app/locale/en_IE/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -43,4 +43,17 @@
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
-
"CP Delete","Delete"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
+
"CP Delete","Delete"
|
| 47 |
+
|
| 48 |
+
"This shipping method is currently unavailable.","This shipping method is currently unavailable."
|
| 49 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Shipping Method"
|
| 50 |
+
"CP Enabled","Enabled"
|
| 51 |
+
"CP Use for backend only","Use for backend only"
|
| 52 |
+
"CP Title","Title"
|
| 53 |
+
"CP Method Name","Method Name"
|
| 54 |
+
"CP Price","Price"
|
| 55 |
+
"CP Ship to Applicable Countries","Ship to Applicable Countries"
|
| 56 |
+
"CP Show Method if Not Applicable","Show Method If Not Applicable"
|
| 57 |
+
"CP Ship to Specific Countries","Ship to Specific Countries"
|
| 58 |
+
"CP Displayed Error Message","Displayed Error Message"
|
| 59 |
+
"CP Sort Order","Sort Order"
|
app/locale/en_NZ/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -43,4 +43,17 @@
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
-
"CP Delete","Delete"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
+
"CP Delete","Delete"
|
| 47 |
+
|
| 48 |
+
"This shipping method is currently unavailable.","This shipping method is currently unavailable."
|
| 49 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Shipping Method"
|
| 50 |
+
"CP Enabled","Enabled"
|
| 51 |
+
"CP Use for backend only","Use for backend only"
|
| 52 |
+
"CP Title","Title"
|
| 53 |
+
"CP Method Name","Method Name"
|
| 54 |
+
"CP Price","Price"
|
| 55 |
+
"CP Ship to Applicable Countries","Ship to Applicable Countries"
|
| 56 |
+
"CP Show Method if Not Applicable","Show Method If Not Applicable"
|
| 57 |
+
"CP Ship to Specific Countries","Ship to Specific Countries"
|
| 58 |
+
"CP Displayed Error Message","Displayed Error Message"
|
| 59 |
+
"CP Sort Order","Sort Order"
|
app/locale/en_US/Channelpilotsolutions_Channelpilot.csv
CHANGED
|
@@ -43,4 +43,17 @@
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
-
"CP Delete","Delete"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 43 |
|
| 44 |
"CP Activate?","Activate?"
|
| 45 |
"CP Add","Add"
|
| 46 |
+
"CP Delete","Delete"
|
| 47 |
+
|
| 48 |
+
"This shipping method is currently unavailable.","This shipping method is currently unavailable."
|
| 49 |
+
"CP ChannelPilot - Shipping Method", "ChannelPilot - Shipping Method"
|
| 50 |
+
"CP Enabled","Enabled"
|
| 51 |
+
"CP Use for backend only","Use for backend only"
|
| 52 |
+
"CP Title","Title"
|
| 53 |
+
"CP Method Name","Method Name"
|
| 54 |
+
"CP Price","Price"
|
| 55 |
+
"CP Ship to Applicable Countries","Ship to Applicable Countries"
|
| 56 |
+
"CP Show Method if Not Applicable","Show Method If Not Applicable"
|
| 57 |
+
"CP Ship to Specific Countries","Ship to Specific Countries"
|
| 58 |
+
"CP Displayed Error Message","Displayed Error Message"
|
| 59 |
+
"CP Sort Order","Sort Order"
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Channelpilotsolutions_Channelpilot</name>
|
| 4 |
-
<version>2.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/gpl-license.php">GPL</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -26,11 +26,12 @@
|
|
| 26 |
<li><b>ChannelPilot Multi-Platform:</b> Access ChannelPilot on any device (e.g. computer, tablet or smartphone) and keep a firm hold on your online marketing- wherever you are!</li>
|
| 27 |
</ul>
|
| 28 |
Just get more information about ChannelPilot: <a href="http://www.channelpilot.com">www.channelpilot.com</a></description>
|
| 29 |
-
<notes>-
|
|
|
|
| 30 |
<authors><author><name>ChannelPilot Solutions GmbH</name><user>auto-converted</user><email>info@channelpilot.com</email></author></authors>
|
| 31 |
-
<date>2015-07-
|
| 32 |
-
<time>
|
| 33 |
-
<contents><target name="magecommunity"><dir name="Channelpilotsolutions"><dir name="Channelpilot"><dir name="Adminhtml"><dir name="Model"><dir name="Articlenumber"><file name="Values.php" hash="a1701067c9e01cd4e7d62ef3bae53c83"/></dir><dir name="Cookiemode"><file name="Values.php" hash="1ec39f85bb7562c1b6a4614f759d9124"/></dir><dir name="Grossnet"><file name="Values.php" hash="11eaf553b0ec34299524ec6d5a9f1e13"/></dir><dir name="Imagenumber"><file name="Values.php" hash="010dbb2ec946627f338bc500d3d8d747"/></dir><dir name="Orderstatus"><file name="Values.php" hash="cbd19b0ff86f303aae19c61327e1dc54"/></dir><dir name="Pricefield"><file name="Values.php" hash="6b02dfa3fa93daafa8325d66a986b4ac"/></dir><dir name="Truefalse"><file name="Values.php" hash="e07f105d7d8dc9881690f162cd23472d"/></dir><dir name="Truefalsesecurity"><file name="Values.php" hash="509b5e1cc7cabbe179373bc0ed490499"/></dir></dir></dir><dir name="Block"><dir name="Adminhtml"><dir name="Field"><file name="Exportfields.php" hash="a6c2be2439015238f80ff1bda555e185"/><file name="Replacefields.php" hash="998c731b9e0419271f5ef13237405ad0"/><file name="Specialfields.php" hash="617a423f8632d0bee669bab5a463ce74"/><file name="Trackingkeys.php" hash="383c5112824ccb2998c74dbc3fe10da1"/></dir><file name="Hintlogo.php" hash="be78974a79e7cc59601254a8df0dc48b"/></dir></dir><dir name="Helper"><dir name="api"><dir name="1_0"><dir name="responses"><file name="GetManagedArticlePricesResponse.php" hash="9ad5adee1952b9408b442449791a1f34"/><file name="GetNewMarketplaceOrdersResponse.php" hash="cd5db953a84759b93a35a360956c4624"/><file name="GetServerTimeResponse.php" hash="07d157639b5bf715aa3f93b0d9e4b736"/><file name="Response.php" hash="c76ce62707a862e1c59346c668055b5d"/><file name="UpdateArticleResult.php" hash="a014c60be447fbb9cf48c947c8e9822f"/><file name="UpdateArticlesResponse.php" hash="338619d50391d91defb5c9d41370022f"/><file name="UpdateOrderResult.php" hash="0fbd88371624270a8cb2c4209a89cfac"/><file name="UpdateOrdersResponse.php" hash="b0ad5828da633b05e654da393b15526a"/></dir><dir name="thin"><file name="CPAddress.php" hash="885fb4517335421fbd8cbc882ae336b1"/><file name="CPArticle.php" hash="1adce1ce33acdd0185dee06010040b18"/><file name="CPArticleUpdate.php" hash="45f514823895c754010f8f11a1ff683a"/><file name="CPAuth.php" hash="cf5fe570dbd98e3e6339b20cec826b7b"/><file name="CPCancellation.php" hash="9bf808e265e09d166466313405a167fc"/><file name="CPCustomer.php" hash="62babdf11e9b4d80ae0afbbf96ba329d"/><file name="CPDelivery.php" hash="
|
| 34 |
<compatible/>
|
| 35 |
<dependencies/>
|
| 36 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Channelpilotsolutions_Channelpilot</name>
|
| 4 |
+
<version>2.1.5</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/gpl-license.php">GPL</license>
|
| 7 |
<channel>community</channel>
|
| 26 |
<li><b>ChannelPilot Multi-Platform:</b> Access ChannelPilot on any device (e.g. computer, tablet or smartphone) and keep a firm hold on your online marketing- wherever you are!</li>
|
| 27 |
</ul>
|
| 28 |
Just get more information about ChannelPilot: <a href="http://www.channelpilot.com">www.channelpilot.com</a></description>
|
| 29 |
+
<notes>- own shipping method added
|
| 30 |
+
- fixed some bugs</notes>
|
| 31 |
<authors><author><name>ChannelPilot Solutions GmbH</name><user>auto-converted</user><email>info@channelpilot.com</email></author></authors>
|
| 32 |
+
<date>2015-07-10</date>
|
| 33 |
+
<time>09:04:26</time>
|
| 34 |
+
<contents><target name="magecommunity"><dir name="Channelpilotsolutions"><dir name="Channelpilot"><dir name="Adminhtml"><dir name="Model"><dir name="Articlenumber"><file name="Values.php" hash="a1701067c9e01cd4e7d62ef3bae53c83"/></dir><dir name="Cookiemode"><file name="Values.php" hash="1ec39f85bb7562c1b6a4614f759d9124"/></dir><dir name="Grossnet"><file name="Values.php" hash="11eaf553b0ec34299524ec6d5a9f1e13"/></dir><dir name="Imagenumber"><file name="Values.php" hash="010dbb2ec946627f338bc500d3d8d747"/></dir><dir name="Orderstatus"><file name="Values.php" hash="cbd19b0ff86f303aae19c61327e1dc54"/></dir><dir name="Pricefield"><file name="Values.php" hash="6b02dfa3fa93daafa8325d66a986b4ac"/></dir><dir name="Truefalse"><file name="Values.php" hash="e07f105d7d8dc9881690f162cd23472d"/></dir><dir name="Truefalsesecurity"><file name="Values.php" hash="509b5e1cc7cabbe179373bc0ed490499"/></dir></dir></dir><dir name="Block"><dir name="Adminhtml"><dir name="Field"><file name="Exportfields.php" hash="a6c2be2439015238f80ff1bda555e185"/><file name="Replacefields.php" hash="998c731b9e0419271f5ef13237405ad0"/><file name="Specialfields.php" hash="617a423f8632d0bee669bab5a463ce74"/><file name="Trackingkeys.php" hash="383c5112824ccb2998c74dbc3fe10da1"/></dir><file name="Hintlogo.php" hash="be78974a79e7cc59601254a8df0dc48b"/></dir></dir><dir name="Helper"><dir name="api"><dir name="1_0"><dir name="responses"><file name="GetManagedArticlePricesResponse.php" hash="9ad5adee1952b9408b442449791a1f34"/><file name="GetNewMarketplaceOrdersResponse.php" hash="cd5db953a84759b93a35a360956c4624"/><file name="GetServerTimeResponse.php" hash="07d157639b5bf715aa3f93b0d9e4b736"/><file name="Response.php" hash="c76ce62707a862e1c59346c668055b5d"/><file name="UpdateArticleResult.php" hash="a014c60be447fbb9cf48c947c8e9822f"/><file name="UpdateArticlesResponse.php" hash="338619d50391d91defb5c9d41370022f"/><file name="UpdateOrderResult.php" hash="0fbd88371624270a8cb2c4209a89cfac"/><file name="UpdateOrdersResponse.php" hash="b0ad5828da633b05e654da393b15526a"/></dir><dir name="thin"><file name="CPAddress.php" hash="885fb4517335421fbd8cbc882ae336b1"/><file name="CPArticle.php" hash="1adce1ce33acdd0185dee06010040b18"/><file name="CPArticleUpdate.php" hash="45f514823895c754010f8f11a1ff683a"/><file name="CPAuth.php" hash="cf5fe570dbd98e3e6339b20cec826b7b"/><file name="CPCancellation.php" hash="9bf808e265e09d166466313405a167fc"/><file name="CPCustomer.php" hash="62babdf11e9b4d80ae0afbbf96ba329d"/><file name="CPDelivery.php" hash="5d94e7262cdddd8415d668e6e4a18e04"/><file name="CPDiscount.php" hash="5d6f2766869134a86761c12230dc32d1"/><file name="CPManagedArticlePrice.php" hash="65c4c0df04b7c8d20294874de11640d6"/><file name="CPMoney.php" hash="952131eccc8470e107c78e15c94b6495"/><file name="CPOrder.php" hash="32623885f664e9b5871fc48b6ba0c801"/><file name="CPOrderHeader.php" hash="828377182e8197c304f230a783606993"/><file name="CPOrderItem.php" hash="dfe2440a08e3d0f13e638fc4090e6c52"/><file name="CPOrderStatus.php" hash="e0e767388dd9a1ab8be5a990f1ab1259"/><file name="CPOrderSummary.php" hash="fceaa6a79b5fc892062681f518fd0243"/><file name="CPPayment.php" hash="446ffde1318d001c213de2b80855af07"/><file name="CPResponseHeader.php" hash="53930210d68046183e3be306996ea9b9"/><file name="CPShipping.php" hash="eaddceace28cdc6ba72434a6321d8c47"/></dir><file name="CPResultCodes.php" hash="955180ee33f14b4afa93f6eb1b5df53f"/><file name="ChannelPilotSellerAPI_v1_0.php" hash="a0a20eeaeba1296eaf318b23fc881e06"/></dir></dir><dir name="handler"><file name="CPAbstractHandler.php" hash="a9a68bad1195518c1362401acec4dc8b"/><file name="CPCancellationHandler.php" hash="be5631a851c46ff6db4b134952464720"/><file name="CPDebugHandler.php" hash="b46b85718747103deed00598aece3c98"/><file name="CPDeliveryHandler.php" hash="1ecaa833b9d03ffdb7e960caa0c9ad9e"/><file name="CPErrorHandler.php" hash="5d728c064c068fdf8354fa87882e4dba"/><file name="CPExportHandler.php" hash="deecbd39ae98a8eaaebc7d0dab50dafa"/><file name="CPNewPriceHandler.php" hash="63217f81326d1753474879407223dec7"/><file name="CPNewsHandler.php" hash="4975a6271baf09af3b2f007f13bb587c"/><file name="CPOrderHandler.php" hash="826c815f4d76991d773ff3d133a410d3"/><file name="CPRegisterHandler.php" hash="22ce15484f7e7cb13dbe2c3c67271f99"/><file name="CPStatusHandler.php" hash="a0e26bee1a847b8aa7da7e33c4ab47c1"/><file name="todoCPPaymentHandler.php" hash="34ea64beda7c8bc5309ebea280146c32"/></dir><dir name="responses"><file name="CPGetStatusHookResponse.php" hash="672609ebcaa23aa0de85aed04c7662d8"/><file name="CPHookResponse.php" hash="9acdda5838cae8b6022af2f4e0a9314b"/><file name="CPRegisterHookResponse.php" hash="206de6433d0795ebdabff98129cc2fb7"/></dir><dir name="special"><file name="CustomerFunctions.php" hash="0d343d3c9c3cb87232c833e0772f730e"/></dir><file name="CPErrors.php" hash="3659c38a1ed3be4aa4ec03d93e68a84e"/><file name="Data.php" hash="c664a6eaefe2c32d4c4cb43f3afaaac9"/><file name="ExportData.php" hash="20da04cfa07db4733e8bc83f820ba0a9"/></dir><dir name="Model"><dir name="Carrier"><file name="Cpshipping.php" hash="5bff2e3502cf98369f126e228c172935"/></dir><file name="Abstract.php" hash="0e9349f1023527a77e59742dfdb21308"/><file name="Payment.php" hash="5160ffe0422a9a46dc2bd7a79e512b8b"/><file name="PaymentTypes.php" hash="b217cdabf427beadb8d74acff069af4d"/><file name="Paymenttypes.php" hash="b217cdabf427beadb8d74acff069af4d"/></dir><dir name="controllers"><file name="IndexController.php" hash="36e391b61d1914f8669cd48207dd06da"/></dir><dir name="etc"><file name="adminhtml.xml" hash="62fad9ef0e77e858b74d2a7bdd6a6879"/><file name="config.xml" hash="39e7e18a268d3e8ee0d83ad623544444"/><file name="system.xml" hash="3649a3d39a27f1434371f204e3dfeeea"/></dir><dir name="sql"><dir name="channelpilot_setup"><file name="mysql4-install-2.0.0.php" hash="8910b9b0507d1b38c8b8465845fb3849"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Channelpilotsolutions_Channelpilot.xml" hash="4cc80daa0c7f8dda239e41a6b17321bf"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="Channelpilotsolutions"><file name="channelpilot.xml" hash="732f1d98851f3c1bf0cb9e655a4a0359"/></dir></dir><dir name="template"><dir name="Channelpilotsolutions"><file name="channelpilot.phtml" hash="ac42e9777d28910dddc50d7d82ded4c2"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="template"><dir name="channelpilotsolutions"><file name="array_dropdown.phtml" hash="cb1230cd8a92ce0a0961f71b396736ec"/><file name="config_hint.phtml" hash="bab45579386a99fe4ccbfb1972ed08fc"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Channelpilotsolutions_Channelpilot.csv" hash="0853df61b80b20154fb8cdffe94e07d3"/></dir><dir name="de_CH"><file name="Channelpilotsolutions_Channelpilot.csv" hash="f7f13e721e2a94e1567a99b3598629a4"/></dir><dir name="de_AT"><file name="Channelpilotsolutions_Channelpilot.csv" hash="f7f13e721e2a94e1567a99b3598629a4"/></dir><dir name="fr_FR"><file name="Channelpilotsolutions_Channelpilot.csv" hash="9a49d3ba87895fb14b234cfa838b9fab"/></dir><dir name="fr_CA"><file name="Channelpilotsolutions_Channelpilot.csv" hash="9a49d3ba87895fb14b234cfa838b9fab"/></dir><dir name="en_AU"><file name="Channelpilotsolutions_Channelpilot.csv" hash="61a1a5a1fd6a3d410a91050026683178"/></dir><dir name="en_CA"><file name="Channelpilotsolutions_Channelpilot.csv" hash="61a1a5a1fd6a3d410a91050026683178"/></dir><dir name="en_GB"><file name="Channelpilotsolutions_Channelpilot.csv" hash="61a1a5a1fd6a3d410a91050026683178"/></dir><dir name="en_IE"><file name="Channelpilotsolutions_Channelpilot.csv" hash="61a1a5a1fd6a3d410a91050026683178"/></dir><dir name="en_NZ"><file name="Channelpilotsolutions_Channelpilot.csv" hash="61a1a5a1fd6a3d410a91050026683178"/></dir><dir name="en_US"><file name="Channelpilotsolutions_Channelpilot.csv" hash="61a1a5a1fd6a3d410a91050026683178"/></dir><dir name="es_AR"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir><dir name="es_CL"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir><dir name="es_CO"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir><dir name="es_CR"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir><dir name="es_ES"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir><dir name="es_MX"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir><dir name="es_PA"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir><dir name="es_PE"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir><dir name="es_VE"><file name="Channelpilotsolutions_Channelpilot.csv" hash="eb81767885d7b76c7e89f9f3c0900fc3"/></dir></target></contents>
|
| 35 |
<compatible/>
|
| 36 |
<dependencies/>
|
| 37 |
</package>
|
