// Merge with revision 7841

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-02 11:43:58 +00:00
parent c945049ef1
commit ffeb22bfb9
130 changed files with 6620 additions and 18585 deletions
+1691
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>canadapost</name>
<displayName><![CDATA[Canada Post Carrier]]></displayName>
<version><![CDATA[0.1]]></version>
<description><![CDATA[Offer your customers, different delivery methods with Canada Post]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[shipping_logistics]]></tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries>ca</limited_countries>
</module>
+36
View File
@@ -0,0 +1,36 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 7233 $
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
Binary file not shown.

After

Width:  |  Height:  |  Size: 1005 B

+81
View File
@@ -0,0 +1,81 @@
<?php
// Init
$sql = array();
// Create Service Table in Database
$sql[] = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cp_rate_service_code` (
`id_cp_rate_service_code` int(10) NOT NULL AUTO_INCREMENT,
`id_carrier` int(10) NOT NULL,
`id_carrier_history` text NOT NULL,
`code` varchar(64) NOT NULL,
`service` varchar(255) NOT NULL,
`delay` varchar(255) NOT NULL,
`active` tinyint(1) NOT NULL,
UNIQUE(`code`, `service`),
PRIMARY KEY (`id_cp_rate_service_code`)
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8;';
// Insert Service in database
$sql[] = "INSERT INTO `"._DB_PREFIX_."cp_rate_service_code` (`id_carrier`, `id_carrier_history`, `code`, `service`, `delay`, `active`) VALUES
('0', '', 'PRIORITY_COURIER', 'Priority Courier', 'Priority Courier: 2 days', '0'),
('0', '', 'REGULAR', 'Regular', 'Regular: 4 days', '0'),
('0', '', 'XPRESSPOST', 'Xpresspost', 'Xpresspost: 1 day', '0'),
('0', '', 'EXPEDITED', 'Expedited', 'Expedited: 1 day', '0'),
('0', '', 'PRIORITY_WORLDWIDE_USA', 'Priority Worldwide USA', 'Priority Worldwide USA', '0'),
('0', '', 'Xpresspost_USA', 'Xpresspost USA', 'Xpresspost USA', '0'),
('0', '', 'Expedited_US_Business', 'Expedited US Business', 'Expedited US Business', '0'),
('0', '', 'Small_Packets_Air', 'Small Packets Air', 'Small Packets Air', '0'),
('0', '', 'Small_Packets_Surface', 'Small Packets Surface', 'Small Packets Surface', '0'),
('0', '', 'U.S.A_Letter-post', 'U.S.A Letter-post', 'U.S.A Letter-post', '0'),
('0', '', 'Priority_Worldwide INTL', 'Priority Worldwide INTL', 'Priority Worldwide INTL', '0'),
('0', '', 'XPressPost_International', 'XPressPost International', 'XPressPost International', '0'),
('0', '', 'Parcel_Surface', 'Parcel Surface', 'Parcel Surface', '0'),
('0', '', 'Small_Packets Surface', 'Small Packets Surface', 'Small Packets Surface', '0'),
('0', '', 'INTL_Letter-post', 'INTL Letter-post', 'INTL Letter-post', '0');";
// Create Cache Table in Database
$sql[] = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cp_cache` (
`id_cp_cache` int(10) NOT NULL AUTO_INCREMENT,
`id_cart` int(10) NOT NULL,
`id_carrier` int(10) NOT NULL,
`hash` varchar(32) NOT NULL,
`id_currency` int(10) NOT NULL,
`total_charges` double(10,2) NOT NULL,
`is_available` tinyint(1) NOT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
PRIMARY KEY (`id_cp_cache`)
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8;';
// Create Test Cache Table in Database
$sql[] = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cp_cache_test` (
`id_cp_cache_test` int(10) NOT NULL AUTO_INCREMENT,
`hash` varchar(1024) NOT NULL,
`result` text NOT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
PRIMARY KEY (`id_cp_cache_test`)
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8;';
// Create Config Table in Database
$sql[] = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cp_rate_config` (
`id_cp_rate_config` int(10) NOT NULL AUTO_INCREMENT,
`id_product` int(10) NOT NULL,
`id_category` int(10) NOT NULL,
`id_currency` int(10) NOT NULL,
`additional_charges` double(6,2) NOT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
PRIMARY KEY (`id_cp_rate_config`)
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8;';
// Create Config (Service) Table in Database
$sql[] = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cp_rate_config_service` (
`id_cp_rate_config_service` int(10) NOT NULL AUTO_INCREMENT,
`id_cp_rate_service_code` int(10) NOT NULL,
`id_cp_rate_config` int(10) NOT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
PRIMARY KEY (`id_cp_rate_config_service`)
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8;';
+9
View File
@@ -0,0 +1,9 @@
<?php
// Init
$sql = array();
$sql[] = 'DROP TABLE IF EXISTS `'._DB_PREFIX_.'cp_rate_service_code`;';
$sql[] = 'DROP TABLE IF EXISTS `'._DB_PREFIX_.'cp_cache`;';
$sql[] = 'DROP TABLE IF EXISTS `'._DB_PREFIX_.'cp_cache_test`;';
$sql[] = 'DROP TABLE IF EXISTS `'._DB_PREFIX_.'cp_rate_config`;';
$sql[] = 'DROP TABLE IF EXISTS `'._DB_PREFIX_.'cp_rate_config_service`;';
+8
View File
@@ -0,0 +1,8 @@
<item>
<quantity>[[Quantity]]</quantity>
<weight>[[PackageWeight]]</weight>
<length>[[Length]]</length>
<width>[[Width]]</width>
<height>[[Height]]</height>
<description>[[Name]]</description>
</item>
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" ?>
<eparcel>
<language>[[IsoCode]]</language>
<ratesAndServicesRequest>
<merchantCPCID>[[UserLogin]]</merchantCPCID>
<fromPostalCode>[[ShipFromPostalCode]]</fromPostalCode>
<itemsPrice>[[ItemsPrice]]</itemsPrice>
<lineItems>
[[PackageList]]
</lineItems>
<city>[[ShipToCity]]</city>
<provOrState>[[ShipToStateCode]]</provOrState>
<country>[[ShipToCountryCode]]</country>
<postalCode>[[ShipToPostalCode]]</postalCode>
</ratesAndServicesRequest>
</eparcel>