Jmango360_Japi - Version 3.3.2

Version Notes

* Bug fixes

Download this release

Release Info

Developer Duc Ngo
Extension Jmango360_Japi
Version 3.3.2
Comparing to
See all releases


Code changes from version 3.3.1 to 3.3.2

Files changed (25) hide show
  1. app/code/community/Jmango360/Japi/Block/Checkout/Cart/Totals.php +32 -21
  2. app/code/community/Jmango360/Japi/Block/Checkout/Onepage/Additional.php +77 -0
  3. app/code/community/Jmango360/Japi/Block/Checkout/Total/Grandtotal.php +40 -0
  4. app/code/community/Jmango360/Japi/Block/Checkout/Total/Shipping.php +12 -0
  5. app/code/community/Jmango360/Japi/Block/Checkout/Total/Subtotal.php +17 -0
  6. app/code/community/Jmango360/Japi/Block/Checkout/Total/Tax.php +17 -0
  7. app/code/community/Jmango360/Japi/Helper/Product.php +43 -6
  8. app/code/community/Jmango360/Japi/Helper/Review/Bazaarvoice.php +103 -8
  9. app/code/community/Jmango360/Japi/Model/Rest/Product/Upsell.php +1 -0
  10. app/code/community/Jmango360/Japi/controllers/CheckoutController.php +14 -0
  11. app/code/community/Jmango360/Japi/etc/config.xml +4 -2
  12. app/code/community/Jmango360/Japi/etc/system.xml +24 -6
  13. app/design/frontend/base/default/layout/jmango360_japi.xml +10 -2
  14. app/design/frontend/base/default/template/japi/checkout/onepage/additional_agreements.phtml +19 -1
  15. app/design/frontend/base/default/template/japi/checkout/onepage/review/info.phtml +1 -0
  16. app/design/frontend/base/default/template/japi/checkout/onepage/review/totals/grand_total.phtml +58 -0
  17. app/design/frontend/base/default/template/japi/checkout/onepage/review/totals/shipping.phtml +66 -0
  18. app/design/frontend/base/default/template/japi/checkout/onepage/review/totals/subtotal.phtml +57 -0
  19. app/design/frontend/base/default/template/japi/checkout/onepage/review/totals/tax.phtml +86 -0
  20. app/design/frontend/base/default/template/japi/checkout/onepage/style.phtml +1 -1
  21. app/design/frontend/base/default/template/japi/customer/form/additional.phtml +12 -0
  22. package.xml +4 -4
  23. skin/frontend/base/default/japi/css/style.css +24 -1
  24. skin/frontend/base/default/japi/css/style.less +26 -1
  25. skin/frontend/base/default/japi/js/checkout.js +10 -0
app/code/community/Jmango360/Japi/Block/Checkout/Cart/Totals.php CHANGED
@@ -1,33 +1,44 @@
1
  <?php
2
  /**
3
- * Copyright 2015 JMango360
 
 
 
 
4
  */
5
  class Jmango360_Japi_Block_Checkout_Cart_Totals extends Mage_Checkout_Block_Cart_Totals
6
  {
7
- /**
8
- * Render total line
9
- */
10
- public function renderTotal($total, $area = null, $colspan = 1)
11
  {
12
- $code = $total->getCode();
13
- if ($total->getAs()) {
14
- $code = $total->getAs();
 
 
 
15
  }
16
- $block = $this->_getTotalRenderer($code);
17
 
18
- $baseDir = 'japi/rwd/onepage/review/totals/';
19
- switch ($code) {
20
- case 'subtotal':
21
- case 'shipping':
22
- case 'tax':
23
- case 'grand_total':
24
- $block->setTemplate($baseDir . $code . '.phtml');
25
- break;
26
  }
27
 
28
- return $block->setTotal($total)
29
- ->setColspan($colspan)
30
- ->setRenderingArea(is_null($area) ? -1 : $area)
31
- ->toHtml();
 
 
 
 
 
 
 
 
 
 
 
 
32
  }
33
  }
1
  <?php
2
  /**
3
+ * Copyright 2017 JMango360
4
+ */
5
+
6
+ /**
7
+ * Class Jmango360_Japi_Block_Checkout_Cart_Totals
8
  */
9
  class Jmango360_Japi_Block_Checkout_Cart_Totals extends Mage_Checkout_Block_Cart_Totals
10
  {
11
+ protected function _getTotalRenderer($code)
 
 
 
12
  {
13
+ $blockName = $code . '_total_renderer';
14
+
15
+ if ($code == 'grand_total') {
16
+ $newCode = 'grandtotal';
17
+ } else {
18
+ $newCode = $code;
19
  }
 
20
 
21
+ try {
22
+ $block = $this->getLayout()->createBlock("japi/checkout_total_{$newCode}", $blockName);
23
+ } catch (Exception $e) {
24
+ $block = null;
 
 
 
 
25
  }
26
 
27
+ if (!$block) {
28
+ $block = $this->_defaultRenderer;
29
+ $config = Mage::getConfig()->getNode("global/sales/quote/totals/{$code}/renderer");
30
+ if ($config) {
31
+ $block = (string)$config;
32
+ }
33
+
34
+ $block = $this->getLayout()->createBlock($block, $blockName);
35
+ }
36
+
37
+ /**
38
+ * Transfer totals to renderer
39
+ */
40
+ $block->setTotals($this->getTotals());
41
+
42
+ return $block;
43
  }
44
  }
app/code/community/Jmango360/Japi/Block/Checkout/Onepage/Additional.php ADDED
@@ -0,0 +1,77 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Copyright 2017 JMango360
4
+ */
5
+
6
+ /**
7
+ * Class Jmango360_Japi_Block_Checkout_Onepage_Additional
8
+ */
9
+ class Jmango360_Japi_Block_Checkout_Onepage_Additional extends Mage_Core_Block_Template
10
+ {
11
+ public function isShowNewsletter()
12
+ {
13
+ $helper = Mage::helper('core');
14
+ if (!$helper->isModuleEnabled('Mage_Newsletter')) {
15
+ return false;
16
+ }
17
+ if ($helper->isModuleEnabled('Idev_OneStepCheckout')) {
18
+ /* @var $oscHelper Idev_OneStepCheckout_Helper_Checkout */
19
+ $oscHelper = Mage::helper('onestepcheckout/checkout');
20
+ if ($oscHelper && method_exists($oscHelper, 'loadConfig')) {
21
+ $oscSettings = $oscHelper->loadConfig();
22
+ $customerEmail = $this->getCustomerEmail();
23
+ return isset($oscSettings['enable_newsletter']) && $oscSettings['enable_newsletter'] && !$this->isSubscribed($customerEmail);
24
+ }
25
+ }
26
+
27
+ return false;
28
+ }
29
+
30
+ public function isNewsletterChecked()
31
+ {
32
+ if (Mage::helper('core')->isModuleEnabled('Idev_OneStepCheckout')) {
33
+ /* @var $oscHelper Idev_OneStepCheckout_Helper_Checkout */
34
+ $oscHelper = Mage::helper('onestepcheckout/checkout');
35
+ if ($oscHelper && method_exists($oscHelper, 'loadConfig')) {
36
+ $oscSettings = $oscHelper->loadConfig();
37
+ return !empty($oscSettings['newsletter_default_checked']);
38
+ }
39
+ }
40
+
41
+ return false;
42
+ }
43
+
44
+ public function getCustomerEmail()
45
+ {
46
+ /* @var $checkoutSession Mage_Checkout_Model_Session */
47
+ $checkoutSession = Mage::getSingleton('checkout/session');
48
+ $quote = $checkoutSession->getQuote();
49
+ $customerEmail = $quote->getCustomerEmail();
50
+
51
+ return $customerEmail;
52
+ }
53
+
54
+ /**
55
+ * Check if e-mail address is subscribed to newsletter
56
+ *
57
+ * @param $email string
58
+ * @return boolean
59
+ */
60
+ protected function isSubscribed($email = null)
61
+ {
62
+ $isSubscribed = false;
63
+
64
+ if (!empty($email)) {
65
+ try {
66
+ /* @var $result Mage_Newsletter_Model_Subscriber */
67
+ $result = Mage::getModel('newsletter/subscriber')->loadByEmail($email);
68
+ if (is_object($result) && $result->getSubscriberStatus() == 1) {
69
+ $isSubscribed = true;
70
+ }
71
+ } catch (Exception $e) {
72
+ }
73
+ }
74
+
75
+ return $isSubscribed;
76
+ }
77
+ }
app/code/community/Jmango360/Japi/Block/Checkout/Total/Grandtotal.php ADDED
@@ -0,0 +1,40 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Copyright 2017 JMango360
4
+ */
5
+
6
+ /**
7
+ * Class Jmango360_Japi_Block_Checkout_Total_Grandtotal
8
+ */
9
+ class Jmango360_Japi_Block_Checkout_Total_Grandtotal extends Mage_Tax_Block_Checkout_Grandtotal
10
+ {
11
+ protected $_template = 'japi/checkout/onepage/review/totals/grand_total.phtml';
12
+
13
+ protected function _getTotalRenderer($code)
14
+ {
15
+ $blockName = $code . '_total_renderer';
16
+
17
+ try {
18
+ $block = $this->getLayout()->createBlock("japi/checkout_total_{$code}", $blockName);
19
+ } catch (Exception $e) {
20
+ $block = null;
21
+ }
22
+
23
+ if (!$block) {
24
+ $block = $this->_defaultRenderer;
25
+ $config = Mage::getConfig()->getNode("global/sales/quote/totals/{$code}/renderer");
26
+ if ($config) {
27
+ $block = (string)$config;
28
+ }
29
+
30
+ $block = $this->getLayout()->createBlock($block, $blockName);
31
+ }
32
+
33
+ /**
34
+ * Transfer totals to renderer
35
+ */
36
+ $block->setTotals($this->getTotals());
37
+
38
+ return $block;
39
+ }
40
+ }
app/code/community/Jmango360/Japi/Block/Checkout/Total/Shipping.php ADDED
@@ -0,0 +1,12 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Copyright 2017 JMango360
4
+ */
5
+
6
+ /**
7
+ * Class Jmango360_Japi_Block_Checkout_Total_Shipping
8
+ */
9
+ class Jmango360_Japi_Block_Checkout_Total_Shipping extends Mage_Tax_Block_Checkout_Shipping
10
+ {
11
+ protected $_template = 'japi/checkout/onepage/review/totals/shipping.phtml';
12
+ }
app/code/community/Jmango360/Japi/Block/Checkout/Total/Subtotal.php ADDED
@@ -0,0 +1,17 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Copyright 2017 JMango360
4
+ */
5
+
6
+ /**
7
+ * Class Jmango360_Japi_Block_Checkout_Total_Subtotal
8
+ */
9
+ class Jmango360_Japi_Block_Checkout_Total_Subtotal extends Mage_Tax_Block_Checkout_Subtotal
10
+ {
11
+ /**
12
+ * Template for the block
13
+ *
14
+ * @var string
15
+ */
16
+ protected $_template = 'japi/checkout/onepage/review/totals/subtotal.phtml';
17
+ }
app/code/community/Jmango360/Japi/Block/Checkout/Total/Tax.php ADDED
@@ -0,0 +1,17 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Copyright 2017 JMango360
4
+ */
5
+
6
+ /**
7
+ * Class Jmango360_Japi_Block_Checkout_Total_Tax
8
+ */
9
+ class Jmango360_Japi_Block_Checkout_Total_Tax extends Mage_Tax_Block_Checkout_Tax
10
+ {
11
+ /**
12
+ * Template used in the block
13
+ *
14
+ * @var string
15
+ */
16
+ protected $_template = 'japi/checkout/onepage/review/totals/tax.phtml';
17
+ }
app/code/community/Jmango360/Japi/Helper/Product.php CHANGED
@@ -563,6 +563,15 @@ class Jmango360_Japi_Helper_Product extends Mage_Core_Helper_Abstract
563
  */
564
  public function addProductReview($collection)
565
  {
 
 
 
 
 
 
 
 
 
566
  /* @var $helper Jmango360_Japi_Helper_Product_Review */
567
  $helper = Mage::helper('japi/product_review');
568
  if ($helper->isModuleEnabled('Mage_Review')) {
@@ -618,15 +627,20 @@ class Jmango360_Japi_Helper_Product extends Mage_Core_Helper_Abstract
618
  /* @var $helper Mage_Catalog_Helper_Image */
619
  $helper = Mage::helper('catalog/image');
620
  $size = $this->_getImageSizes();
621
- $imageListing = Mage::getStoreConfig('japi/jmango_rest_gallery_settings/image_default_listing');
622
- if (!$imageListing || !array_key_exists($imageListing, $this->_defaultImagesPaths)) $imageListing = 'small_image';
 
 
 
 
623
  if ($details) {
624
  $imageWidth = !empty($size['image']['width']) ? $size['image']['width'] : 1200;
625
  $imageHeight = !empty($size['image']['height']) ? $size['image']['height'] : 1200;
626
  } else {
627
- $imageWidth = !empty($size[$imageListing]['width']) ? $size[$imageListing]['width'] : 400;
628
- $imageHeight = !empty($size[$imageListing]['height']) ? $size[$imageListing]['height'] : 400;
629
  }
 
630
  $imageFallback = false;
631
  $image = '';
632
 
@@ -649,7 +663,20 @@ class Jmango360_Japi_Helper_Product extends Mage_Core_Helper_Abstract
649
  }
650
 
651
  if ($imageFallback) {
652
- $image = (string)$helper->init($product, $imageListing)->resize($imageWidth, $imageHeight);
 
 
 
 
 
 
 
 
 
 
 
 
 
653
  }
654
 
655
  return $image;
@@ -1438,7 +1465,17 @@ class Jmango360_Japi_Helper_Product extends Mage_Core_Helper_Abstract
1438
  /* @var $helper Jmango360_Japi_Helper_Data */
1439
  $helper = Mage::helper('japi');
1440
  if ($helper->isBazaarvoiceEnabled()) {
1441
- $result['review'] = null;
 
 
 
 
 
 
 
 
 
 
1442
  return;
1443
  }
1444
 
563
  */
564
  public function addProductReview($collection)
565
  {
566
+ /* @var $japiHelper Jmango360_Japi_Helper_Data */
567
+ $japiHelper = Mage::helper('japi');
568
+ if ($japiHelper->isBazaarvoiceEnabled()) {
569
+ /* @var $bvHelper Jmango360_Japi_Helper_Review_Bazaarvoice */
570
+ $bvHelper = Mage::helper('japi/review_bazaarvoice');
571
+ $bvHelper->appendReviews($collection);
572
+ return;
573
+ }
574
+
575
  /* @var $helper Jmango360_Japi_Helper_Product_Review */
576
  $helper = Mage::helper('japi/product_review');
577
  if ($helper->isModuleEnabled('Mage_Review')) {
627
  /* @var $helper Mage_Catalog_Helper_Image */
628
  $helper = Mage::helper('catalog/image');
629
  $size = $this->_getImageSizes();
630
+
631
+ $imageType = Mage::getStoreConfig('japi/jmango_rest_gallery_settings/image_default_listing');
632
+ if (!$imageType || !array_key_exists($imageType, $this->_defaultImagesPaths)) {
633
+ $imageType = 'small_image';
634
+ }
635
+
636
  if ($details) {
637
  $imageWidth = !empty($size['image']['width']) ? $size['image']['width'] : 1200;
638
  $imageHeight = !empty($size['image']['height']) ? $size['image']['height'] : 1200;
639
  } else {
640
+ $imageWidth = !empty($size[$imageType]['width']) ? $size[$imageType]['width'] : 400;
641
+ $imageHeight = !empty($size[$imageType]['height']) ? $size[$imageType]['height'] : 400;
642
  }
643
+
644
  $imageFallback = false;
645
  $image = '';
646
 
663
  }
664
 
665
  if ($imageFallback) {
666
+ if (!$product->getData($imageType) || $product->getData($imageType) == 'no_selection') {
667
+ /**
668
+ * MPLUGIN-1875: get parent image instead
669
+ */
670
+ if ($parentId = $this->_getRequest()->getParam('parent_id')) {
671
+ /* @var $parent Mage_Catalog_Model_Product */
672
+ $parent = Mage::getModel('catalog/product')->load($parentId, array_keys($this->_defaultImagesPaths));
673
+ $image = (string)$helper->init($parent, $imageType)->resize($imageWidth, $imageHeight);
674
+ } else {
675
+ $image = (string)$helper->init($product, $imageType)->resize($imageWidth, $imageHeight);
676
+ }
677
+ } else {
678
+ $image = (string)$helper->init($product, $imageType)->resize($imageWidth, $imageHeight);
679
+ }
680
  }
681
 
682
  return $image;
1465
  /* @var $helper Jmango360_Japi_Helper_Data */
1466
  $helper = Mage::helper('japi');
1467
  if ($helper->isBazaarvoiceEnabled()) {
1468
+ if ($product->getRatingSummary() && $product->getRatingSummary()->getReviewsCount()) {
1469
+ $result['review'] = array(
1470
+ 'type' => 'overview',
1471
+ 'code' => 'overview',
1472
+ 'values' => range(1, $product->getRatingSummary()->getRatingRange()),
1473
+ 'review_counter' => $product->getRatingSummary()->getReviewsCount(),
1474
+ 'percent' => $product->getRatingSummary()->getRatingSummary()
1475
+ );
1476
+ } else {
1477
+ $result['review'] = null;
1478
+ }
1479
  return;
1480
  }
1481
 
app/code/community/Jmango360/Japi/Helper/Review/Bazaarvoice.php CHANGED
@@ -10,12 +10,13 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
10
  {
11
  const URL_STAGING = 'https://stg.api.bazaarvoice.com/';
12
  const URL_PRODUCTION = 'https://api.bazaarvoice.com/';
 
13
 
14
  const DEFAULT_LIMIT = 99;
15
  const DEFAULT_SORT = 'SubmissionTime';
16
  const DEFAULT_DIR = 'desc';
17
 
18
- const CACHE_KEY_REVIEW_FORM = 'BV_REVIEW_FORM';
19
 
20
  protected $FORM_FIELDS = array(
21
  'rating' => 'Overall Rating',
@@ -90,6 +91,73 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
90
  return preg_replace_callback('/[^\w\d\*-\._]/s', create_function('$match', 'return "_bv".ord($match[0])."_";'), $rawId);
91
  }
92
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
93
  /**
94
  * Requesting all reviews for a particular product
95
  *
@@ -181,7 +249,7 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
181
 
182
  $cacheKeys[] = self::CACHE_KEY_REVIEW_FORM;
183
  $cacheKeys[] = Mage::app()->getStore()->getId();
184
- $cacheKeys[] = $product->getId();
185
 
186
  /* @var $session Mage_Customer_Model_Session */
187
  $session = Mage::getSingleton('customer/session');
@@ -206,8 +274,8 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
206
 
207
  $data = array(
208
  'allow_guest_review' => true,
209
- 'photo_review' => true,
210
- 'video_review' => true,
211
  'api_key' => $apiKey,
212
  'photo_url' => $this->_getApiUrl('data/uploadphoto.json', array(
213
  'ApiVersion' => '5.4',
@@ -224,7 +292,18 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
224
  }
225
  }
226
  }
 
227
  $fields = $result['Data']['Fields'];
 
 
 
 
 
 
 
 
 
 
228
  $index = 0;
229
  foreach ($outputFields as $field => $label) {
230
  foreach ($fields as $fieldName => $fieldData) {
@@ -262,7 +341,13 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
262
  }
263
 
264
  if (@$fieldData['Id'] == 'agreedtotermsandconditions') {
265
- $fieldTmp['html'] = null;
 
 
 
 
 
 
266
  }
267
 
268
  if (@$fieldData['Id'] == 'useremail') {
@@ -277,7 +362,10 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
277
  }
278
  }
279
 
280
- $cache->save(Mage::helper('core')->jsonEncode($data), $cacheKey, array(Mage_Core_Model_Config::CACHE_TAG), 60 * 60);
 
 
 
281
  }
282
 
283
  return Mage::helper('core')->jsonDecode($cache->load($cacheKey));
@@ -666,7 +754,14 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
666
 
667
  protected function _getApiKey()
668
  {
669
- $apiKey = Mage::getStoreConfig('japi/jmango_rest_bazaarvoice_settings/api_key');
 
 
 
 
 
 
 
670
  if (!$apiKey) {
671
  throw new Jmango360_Japi_Exception(
672
  Mage::helper('japi')->__('Invalid API Key value'),
@@ -686,7 +781,7 @@ class Jmango360_Japi_Helper_Review_Bazaarvoice extends Mage_Core_Helper_Abstract
686
 
687
  curl_setopt($ch, CURLOPT_URL, $url);
688
  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
689
- curl_setopt($ch, CURLOPT_TIMEOUT, 5);
690
 
691
  if ($method == 'POST') {
692
  curl_setopt($ch, CURLOPT_POST, 1);
10
  {
11
  const URL_STAGING = 'https://stg.api.bazaarvoice.com/';
12
  const URL_PRODUCTION = 'https://api.bazaarvoice.com/';
13
+ const API_VERSION = '5.4';
14
 
15
  const DEFAULT_LIMIT = 99;
16
  const DEFAULT_SORT = 'SubmissionTime';
17
  const DEFAULT_DIR = 'desc';
18
 
19
+ const CACHE_KEY_REVIEW_FORM = 'BAZAARVOICE_REVIEW_FORM';
20
 
21
  protected $FORM_FIELDS = array(
22
  'rating' => 'Overall Rating',
91
  return preg_replace_callback('/[^\w\d\*-\._]/s', create_function('$match', 'return "_bv".ord($match[0])."_";'), $rawId);
92
  }
93
 
94
+ /**
95
+ * Append review data to product collection
96
+ *
97
+ * @param Mage_Catalog_Model_Resource_Product_Collection $collection
98
+ * @throws Jmango360_Japi_Exception
99
+ */
100
+ public function appendReviews($collection)
101
+ {
102
+ if (!$collection || !$collection->getSize()) {
103
+ return;
104
+ }
105
+
106
+ $productIds = array();
107
+ foreach ($collection as $item) {
108
+ $productIds[$this->_getProductId($item)] = $item;
109
+ }
110
+ $locale = Mage::app()->getLocale()->getLocaleCode();
111
+ $apikey = $this->_getApiKey();
112
+ $url = $this->_getApiUrl('data/batch.json', array(
113
+ 'passkey' => $apikey,
114
+ 'apiVersion' => self::API_VERSION,
115
+ 'resource.q0' => 'statistics',
116
+ 'stats.q0' => 'reviews',
117
+ 'filter.q0' => 'contentlocale:eq:' . $locale,
118
+ 'filter_reviews.q0' => 'contentlocale:eq:' . $locale,
119
+ 'filter.q0' => 'productid:eq:' . join(',', array_keys($productIds))
120
+ ));
121
+
122
+ $result = $this->send('GET', $url);
123
+
124
+ if (isset($result['HasErrors']) && $result['HasErrors']) {
125
+ if (!empty($result['Errors'])) {
126
+ foreach ($result['Errors'] as $error) {
127
+ throw new Jmango360_Japi_Exception(
128
+ sprintf('%s', $error['Message']),
129
+ Jmango360_Japi_Model_Request::HTTP_INTERNAL_ERROR
130
+ );
131
+ }
132
+ } else {
133
+ throw new Jmango360_Japi_Exception(
134
+ Mage::helper('japi')->__('An error has occurred, please try again later.'),
135
+ Jmango360_Japi_Model_Request::HTTP_INTERNAL_ERROR
136
+ );
137
+ }
138
+ }
139
+
140
+ if (!empty($result['BatchedResults']['q0']['Results'])) {
141
+ $reviewsData = $result['BatchedResults']['q0']['Results'];
142
+ foreach ($reviewsData as $reviewData) {
143
+ if (!empty($reviewData['ProductStatistics'])) {
144
+ $productData = $reviewData['ProductStatistics'];
145
+ $ratingSummary = new Varien_Object();
146
+ $ratingSummary->setReviewsCount(@$productData['ReviewStatistics']['TotalReviewCount']);
147
+ $averageOverallRating = @$productData['ReviewStatistics']['AverageOverallRating'];
148
+ $overallRatingRange = @$productData['ReviewStatistics']['OverallRatingRange'];
149
+ $ratingSummary->setRatingSummary(floor(100 * $averageOverallRating / $overallRatingRange));
150
+ $ratingSummary->setRatingRange($overallRatingRange);
151
+ foreach ($productIds as $id => $item) {
152
+ if ($id == @$productData['ProductId']) {
153
+ $item->setRatingSummary($ratingSummary);
154
+ }
155
+ }
156
+ }
157
+ }
158
+ }
159
+ }
160
+
161
  /**
162
  * Requesting all reviews for a particular product
163
  *
249
 
250
  $cacheKeys[] = self::CACHE_KEY_REVIEW_FORM;
251
  $cacheKeys[] = Mage::app()->getStore()->getId();
252
+ //$cacheKeys[] = $product->getId();
253
 
254
  /* @var $session Mage_Customer_Model_Session */
255
  $session = Mage::getSingleton('customer/session');
274
 
275
  $data = array(
276
  'allow_guest_review' => true,
277
+ 'photo_review' => false,
278
+ 'video_review' => false,
279
  'api_key' => $apiKey,
280
  'photo_url' => $this->_getApiUrl('data/uploadphoto.json', array(
281
  'ApiVersion' => '5.4',
292
  }
293
  }
294
  }
295
+
296
  $fields = $result['Data']['Fields'];
297
+
298
+ foreach ($fields as $field => $fieldData) {
299
+ if (strpos($field, 'photourl_') !== false) {
300
+ $data['photo_review'] = true;
301
+ }
302
+ if (strpos($field, 'videourl_') !== false) {
303
+ $data['video_review'] = true;
304
+ }
305
+ }
306
+
307
  $index = 0;
308
  foreach ($outputFields as $field => $label) {
309
  foreach ($fields as $fieldName => $fieldData) {
341
  }
342
 
343
  if (@$fieldData['Id'] == 'agreedtotermsandconditions') {
344
+ $html = Mage::getStoreConfig('japi/jmango_rest_bazaarvoice_settings/tc');
345
+ $html = str_replace("\n", '<br/>', $html);
346
+ $html = sprintf('<!DOCTYPE html><html><head><title>%s</title></head><body>%s</body></html>',
347
+ $this->__('Terms & Conditions'),
348
+ $html
349
+ );
350
+ $fieldTmp['html'] = $html;
351
  }
352
 
353
  if (@$fieldData['Id'] == 'useremail') {
362
  }
363
  }
364
 
365
+ $cache->save(Mage::helper('core')->jsonEncode($data), $cacheKey,
366
+ array(Mage_Core_Model_Config::CACHE_TAG, strtoupper(Mage_Core_Block_Abstract::CACHE_GROUP)),
367
+ 60 * 60
368
+ );
369
  }
370
 
371
  return Mage::helper('core')->jsonDecode($cache->load($cacheKey));
754
 
755
  protected function _getApiKey()
756
  {
757
+ $apiKey = null;
758
+
759
+ if ($this->_getEnv() == 'staging') {
760
+ $apiKey = Mage::getStoreConfig('japi/jmango_rest_bazaarvoice_settings/api_key_stg');
761
+ } elseif ($this->_getEnv() == 'production') {
762
+ $apiKey = Mage::getStoreConfig('japi/jmango_rest_bazaarvoice_settings/api_key_prod');
763
+ }
764
+
765
  if (!$apiKey) {
766
  throw new Jmango360_Japi_Exception(
767
  Mage::helper('japi')->__('Invalid API Key value'),
781
 
782
  curl_setopt($ch, CURLOPT_URL, $url);
783
  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
784
+ curl_setopt($ch, CURLOPT_TIMEOUT, 10);
785
 
786
  if ($method == 'POST') {
787
  curl_setopt($ch, CURLOPT_POST, 1);
app/code/community/Jmango360/Japi/Model/Rest/Product/Upsell.php CHANGED
@@ -55,6 +55,7 @@ class Jmango360_Japi_Model_Rest_Product_Upsell extends Jmango360_Japi_Model_Rest
55
  protected function _addProductAttributesAndPrices(Mage_Catalog_Model_Resource_Product_Collection $collection)
56
  {
57
  return $collection
 
58
  ->addMinimalPrice()
59
  ->addFinalPrice()
60
  ->addTaxPercents()
55
  protected function _addProductAttributesAndPrices(Mage_Catalog_Model_Resource_Product_Collection $collection)
56
  {
57
  return $collection
58
+ ->addAttributeToSelect(array('sku'))
59
  ->addMinimalPrice()
60
  ->addFinalPrice()
61
  ->addTaxPercents()
app/code/community/Jmango360/Japi/controllers/CheckoutController.php CHANGED
@@ -694,6 +694,20 @@ class Jmango360_Japi_CheckoutController extends Mage_Checkout_OnepageController
694
  }
695
  }
696
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
697
  if ($redirectUrl = $this->getRequest()->getPost('redirect')) {
698
  $result['success'] = true;
699
  $result['error'] = false;
694
  }
695
  }
696
 
697
+ if ($subscribeNewsletter = $this->getRequest()->getPost('subscribe_newsletter')) {
698
+ if (Mage::helper('core')->isModuleEnabled('Mage_Newsletter')) {
699
+ /* @var $subscriberModel Mage_Newsletter_Model_Subscriber */
700
+ $subscriberModel = Mage::getModel('newsletter/subscriber');
701
+ $subscriberModel->loadByEmail($quote->getCustomerEmail());
702
+ if (!$subscriberModel->isSubscribed()) {
703
+ $subscribeobj = $subscriberModel->subscribe($quote->getCustomerEmail());
704
+ if (is_object($subscribeobj)) {
705
+ $subscribeobj->save();
706
+ }
707
+ }
708
+ }
709
+ }
710
+
711
  if ($redirectUrl = $this->getRequest()->getPost('redirect')) {
712
  $result['success'] = true;
713
  $result['error'] = false;
app/code/community/Jmango360/Japi/etc/config.xml CHANGED
@@ -7,7 +7,7 @@
7
  <config>
8
  <modules>
9
  <Jmango360_Japi>
10
- <version>3.3.1</version>
11
  </Jmango360_Japi>
12
  </modules>
13
 
@@ -411,7 +411,9 @@
411
  </jmango_smart_app_banner>
412
  <jmango_rest_bazaarvoice_settings>
413
  <env>staging</env>
414
- <api_key></api_key>
 
 
415
  </jmango_rest_bazaarvoice_settings>
416
  <jmango_rest_developer_settings>
417
  <enable>0</enable>
7
  <config>
8
  <modules>
9
  <Jmango360_Japi>
10
+ <version>3.3.2</version>
11
  </Jmango360_Japi>
12
  </modules>
13
 
411
  </jmango_smart_app_banner>
412
  <jmango_rest_bazaarvoice_settings>
413
  <env>staging</env>
414
+ <api_key_stg></api_key_stg>
415
+ <api_key_prod></api_key_prod>
416
+ <tc></tc>
417
  </jmango_rest_bazaarvoice_settings>
418
  <jmango_rest_developer_settings>
419
  <enable>0</enable>
app/code/community/Jmango360/Japi/etc/system.xml CHANGED
@@ -701,7 +701,7 @@
701
  </android_touch_icon>
702
  </fields>
703
  </jmango_smart_app_banner-->
704
- <!--jmango_rest_bazaarvoice_settings translate="label" module="japi">
705
  <label>Bazaarvoice Settings</label>
706
  <show_in_default>1</show_in_default>
707
  <show_in_website>1</show_in_website>
@@ -718,17 +718,35 @@
718
  <show_in_store>1</show_in_store>
719
  <comment>Select environment</comment>
720
  </env>
721
- <api_key translate="label comment" module="japi">
722
- <label>Bazaarvoice API Key</label>
723
  <frontend_type>text</frontend_type>
724
  <sort_order>20</sort_order>
725
  <show_in_default>1</show_in_default>
726
  <show_in_website>1</show_in_website>
727
  <show_in_store>1</show_in_store>
728
- <comment>Bazaarvoice Conversations API key (prod)</comment>
729
- </api_key>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
730
  </fields>
731
- </jmango_rest_bazaarvoice_settings-->
732
  <jmango_rest_developer_settings translate="label" module="japi">
733
  <label>Developer</label>
734
  <show_in_default>1</show_in_default>
701
  </android_touch_icon>
702
  </fields>
703
  </jmango_smart_app_banner-->
704
+ <jmango_rest_bazaarvoice_settings translate="label" module="japi">
705
  <label>Bazaarvoice Settings</label>
706
  <show_in_default>1</show_in_default>
707
  <show_in_website>1</show_in_website>
718
  <show_in_store>1</show_in_store>
719
  <comment>Select environment</comment>
720
  </env>
721
+ <api_key_stg translate="label comment" module="japi">
722
+ <label>Bazaarvoice API Key (STG)</label>
723
  <frontend_type>text</frontend_type>
724
  <sort_order>20</sort_order>
725
  <show_in_default>1</show_in_default>
726
  <show_in_website>1</show_in_website>
727
  <show_in_store>1</show_in_store>
728
+ <comment>Bazaarvoice Conversations API key (staging)</comment>
729
+ </api_key_stg>
730
+ <api_key_prod translate="label comment" module="japi">
731
+ <label>Bazaarvoice API Key (PROD)</label>
732
+ <frontend_type>text</frontend_type>
733
+ <sort_order>30</sort_order>
734
+ <show_in_default>1</show_in_default>
735
+ <show_in_website>1</show_in_website>
736
+ <show_in_store>1</show_in_store>
737
+ <comment>Bazaarvoice Conversations API key (production)</comment>
738
+ </api_key_prod>
739
+ <tc translate="label comment" module="japi">
740
+ <label><![CDATA[Terms & Conditions]]></label>
741
+ <frontend_type>textarea</frontend_type>
742
+ <sort_order>40</sort_order>
743
+ <show_in_default>1</show_in_default>
744
+ <show_in_website>1</show_in_website>
745
+ <show_in_store>1</show_in_store>
746
+ <comment>Customize the terms and conditions that your users will see for all submissions</comment>
747
+ </tc>
748
  </fields>
749
+ </jmango_rest_bazaarvoice_settings>
750
  <jmango_rest_developer_settings translate="label" module="japi">
751
  <label>Developer</label>
752
  <show_in_default>1</show_in_default>
app/design/frontend/base/default/layout/jmango360_japi.xml CHANGED
@@ -118,7 +118,7 @@
118
  <block>bundle/checkout_cart_item_renderer</block>
119
  <template>japi/checkout/onepage/review/item.phtml</template>
120
  </action>
121
- <block type="checkout/cart_totals" name="checkout.onepage.review.info.totals" as="totals" template="japi/checkout/onepage/review/totals.phtml"/>
122
  <block type="core/text_list" name="checkout.onepage.review.info.items.before" as="items_before" output="toHtml" translate="label">
123
  <label>Items Before</label>
124
  </block>
@@ -126,13 +126,20 @@
126
  <label>Items After</label>
127
  </block>
128
  <block type="checkout/agreements" name="checkout.onepage.agreements" as="agreements" template="japi/checkout/onepage/agreements.phtml"/>
129
- <block type="core/template" name="checkout.onepage.additional_agreements" as="additional_agreements" template="japi/checkout/onepage/additional_agreements.phtml"/>
130
  <block type="checkout/cart_coupon" name="checkout.cart.coupon" as="coupon">
131
  <action method="setTemplate" ifconfig="japi/jmango_rest_checkout_settings/enable_coupon">
132
  <template>japi/checkout/onepage/coupon.phtml</template>
133
  </action>
134
  </block>
135
  <block type="japi/checkout_onepage_button" name="checkout.onepage.review.button" as="button"/>
 
 
 
 
 
 
 
136
  </block>
137
  </japi_checkout_review>
138
 
@@ -188,6 +195,7 @@
188
  <block type="page/html_wrapper" name="customer.form.register.fields.before" as="form_fields_before" translate="label">
189
  <label>Form Fields Before</label>
190
  </block>
 
191
  </block>
192
  </reference>
193
  </japi_customer_register>
118
  <block>bundle/checkout_cart_item_renderer</block>
119
  <template>japi/checkout/onepage/review/item.phtml</template>
120
  </action>
121
+ <block type="japi/checkout_cart_totals" name="checkout.onepage.review.info.totals" as="totals" template="japi/checkout/onepage/review/totals.phtml"/>
122
  <block type="core/text_list" name="checkout.onepage.review.info.items.before" as="items_before" output="toHtml" translate="label">
123
  <label>Items Before</label>
124
  </block>
126
  <label>Items After</label>
127
  </block>
128
  <block type="checkout/agreements" name="checkout.onepage.agreements" as="agreements" template="japi/checkout/onepage/agreements.phtml"/>
129
+ <block type="japi/checkout_onepage_additional" name="checkout.onepage.additional_agreements" as="additional_agreements" template="japi/checkout/onepage/additional_agreements.phtml"/>
130
  <block type="checkout/cart_coupon" name="checkout.cart.coupon" as="coupon">
131
  <action method="setTemplate" ifconfig="japi/jmango_rest_checkout_settings/enable_coupon">
132
  <template>japi/checkout/onepage/coupon.phtml</template>
133
  </action>
134
  </block>
135
  <block type="japi/checkout_onepage_button" name="checkout.onepage.review.button" as="button"/>
136
+ <block type="core/text_list" name="additional.product.info" translate="label">
137
+ <block type="core/template" name="gestpay.review">
138
+ <action method="setTemplate" ifconfig="payment/gestpaypro/active">
139
+ <template>bitbull/bancasellapro/checkout/review.phtml</template>
140
+ </action>
141
+ </block>
142
+ </block>
143
  </block>
144
  </japi_checkout_review>
145
 
195
  <block type="page/html_wrapper" name="customer.form.register.fields.before" as="form_fields_before" translate="label">
196
  <label>Form Fields Before</label>
197
  </block>
198
+ <block type="core/template" name="form.additional.info" template="japi/customer/form/additional.phtml"/>
199
  </block>
200
  </reference>
201
  </japi_customer_register>
app/design/frontend/base/default/template/japi/checkout/onepage/additional_agreements.phtml CHANGED
@@ -1,4 +1,22 @@
1
- <?php if (strpos(Mage::getUrl(), 'voordeelwijnen.nl')): ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <form action="" method="post" id="yearCheckForm" class="form-list" style="padding-top: 1em">
3
  <p>Om te kunnen bestellen moet u 18 jaar of ouder zijn.</p>
4
  <input type="checkbox" name="16year" id="yearcheck" class="required-entry"/>
1
+ <?php
2
+ /**
3
+ * Copyright 2017 JMango360
4
+ */
5
+ ?>
6
+ <?php /* @var $this Jmango360_Japi_Block_Checkout_Onepage_Additional */ ?>
7
+ <?php if ($this->isShowNewsletter()): ?>
8
+ <form action="" method="post" id="subscribeNewsletterForm" class="form-list" style="padding-top: 1em">
9
+ <input type="checkbox" id="id_subscribe_newsletter" name="subscribe_newsletter" value="1"
10
+ <?php if ($this->isNewsletterChecked()): ?>checked="checked"<?php endif; ?> />
11
+ <label for="id_subscribe_newsletter"><?php echo $this->__('Subscribe to our newsletter'); ?></label>
12
+ </form>
13
+ <script type="text/javascript">
14
+ setTimeout(function () {
15
+ review.addMoreFormToSubmit('subscribeNewsletterForm');
16
+ });
17
+ </script>
18
+ <?php endif; ?>
19
+ <?php if (strpos(Mage::getUrl(), 'voordeelwijnen.local')): ?>
20
  <form action="" method="post" id="yearCheckForm" class="form-list" style="padding-top: 1em">
21
  <p>Om te kunnen bestellen moet u 18 jaar of ouder zijn.</p>
22
  <input type="checkbox" name="16year" id="yearcheck" class="required-entry"/>
app/design/frontend/base/default/template/japi/checkout/onepage/review/info.phtml CHANGED
@@ -38,6 +38,7 @@
38
  <?php echo $this->getChildHtml('items_after'); ?>
39
  <div id="checkout-review-submit">
40
  <?php echo $this->getChildHtml('agreements') ?>
 
41
  <?php echo $this->getChildHtml('coupon') ?>
42
  <div class="buttons-set" id="review-buttons-container">
43
  <?php echo $this->getChildHtml('button') ?>
38
  <?php echo $this->getChildHtml('items_after'); ?>
39
  <div id="checkout-review-submit">
40
  <?php echo $this->getChildHtml('agreements') ?>
41
+ <?php echo $this->getChildHtml('additional_agreements') ?>
42
  <?php echo $this->getChildHtml('coupon') ?>
43
  <div class="buttons-set" id="review-buttons-container">
44
  <?php echo $this->getChildHtml('button') ?>
app/design/frontend/base/default/template/japi/checkout/onepage/review/totals/grand_total.phtml ADDED
@@ -0,0 +1,58 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ /**
27
+ * @var $this Mage_Tax_Block_Checkout_Grandtotal
28
+ * @see Mage_Tax_Block_Checkout_Grandtotal
29
+ */
30
+ ?>
31
+ <?php if ($this->includeTax() && $this->getTotalExclTax()>=0):?>
32
+ <tr>
33
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
34
+ <strong><?php echo $this->helper('tax')->__('Grand Total Excl. Tax')?></strong>
35
+ </td>
36
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
37
+ <strong><?php echo $this->helper('checkout')->formatPrice($this->getTotalExclTax()) ?></strong>
38
+ </td>
39
+ </tr>
40
+ <?php echo $this->renderTotals('taxes', $this->getColspan()); ?>
41
+ <tr>
42
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
43
+ <strong><?php echo $this->helper('tax')->__('Grand Total Incl. Tax')?></strong>
44
+ </td>
45
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
46
+ <strong><?php echo $this->helper('checkout')->formatPrice($this->getTotal()->getValue()) ?></strong>
47
+ </td>
48
+ </tr>
49
+ <?php else:?>
50
+ <tr>
51
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
52
+ <strong><?php echo $this->getTotal()->getTitle() ?></strong>
53
+ </td>
54
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
55
+ <strong><?php echo $this->helper('checkout')->formatPrice($this->getTotal()->getValue()) ?></strong>
56
+ </td>
57
+ </tr>
58
+ <?php endif;?>
app/design/frontend/base/default/template/japi/checkout/onepage/review/totals/shipping.phtml ADDED
@@ -0,0 +1,66 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ /**
27
+ * @var $this Mage_Tax_Block_Checkout_Shipping
28
+ * @see Mage_Tax_Block_Checkout_Shipping
29
+ */
30
+ ?>
31
+ <?php if ($this->displayBoth()):?>
32
+ <tr>
33
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
34
+ <?php echo $this->getExcludeTaxLabel() ?>
35
+ </td>
36
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
37
+ <?php echo $this->helper('checkout')->formatPrice($this->getShippingExcludeTax()) ?>
38
+ </td>
39
+ </tr>
40
+ <tr>
41
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
42
+ <?php echo $this->getIncludeTaxLabel() ?>
43
+ </td>
44
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
45
+ <?php echo $this->helper('checkout')->formatPrice($this->getShippingIncludeTax()) ?>
46
+ </td>
47
+ </tr>
48
+ <?php elseif($this->displayIncludeTax()) : ?>
49
+ <tr>
50
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
51
+ <?php echo $this->getTotal()->getTitle() ?>
52
+ </td>
53
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
54
+ <?php echo $this->helper('checkout')->formatPrice($this->getShippingIncludeTax()) ?>
55
+ </td>
56
+ </tr>
57
+ <?php else:?>
58
+ <tr>
59
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
60
+ <?php echo $this->escapeHtml($this->getTotal()->getTitle()) ?>
61
+ </td>
62
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
63
+ <?php echo $this->helper('checkout')->formatPrice($this->getShippingExcludeTax()) ?>
64
+ </td>
65
+ </tr>
66
+ <?php endif;?>
app/design/frontend/base/default/template/japi/checkout/onepage/review/totals/subtotal.phtml ADDED
@@ -0,0 +1,57 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ /**
27
+ * @var $this Mage_Tax_Block_Checkout_Subtotal
28
+ * @see Mage_Tax_Block_Checkout_Subtotal
29
+ */
30
+ ?>
31
+ <?php if ($this->displayBoth()):?>
32
+ <tr>
33
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
34
+ <?php echo $this->helper('tax')->__('Subtotal (Excl. Tax)') ?>
35
+ </td>
36
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
37
+ <?php echo $this->helper('checkout')->formatPrice($this->getTotal()->getValueExclTax()) ?>
38
+ </td>
39
+ </tr>
40
+ <tr>
41
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
42
+ <?php echo $this->helper('tax')->__('Subtotal (Incl. Tax)') ?>
43
+ </td>
44
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
45
+ <?php echo $this->helper('checkout')->formatPrice($this->getTotal()->getValueInclTax()) ?>
46
+ </td>
47
+ </tr>
48
+ <?php else : ?>
49
+ <tr>
50
+ <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
51
+ <?php echo $this->getTotal()->getTitle() ?>
52
+ </td>
53
+ <td style="<?php echo $this->getStyle() ?>" class="a-right">
54
+ <?php echo $this->helper('checkout')->formatPrice($this->getTotal()->getValue()) ?>
55
+ </td>
56
+ </tr>
57
+ <?php endif;?>
app/design/frontend/base/default/template/japi/checkout/onepage/review/totals/tax.phtml ADDED
@@ -0,0 +1,86 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ /**
27
+ * @var $this Mage_Tax_Block_Checkout_Tax
28
+ * @see Mage_Tax_Block_Checkout_Tax
29
+ */
30
+ ?>
31
+ <?php
32
+ $_value = $this->getTotal()->getValue();
33
+ $_style = $this->getTotal()->getStyle();
34
+ ?>
35
+ <?php global $taxIter; $taxIter++; ?>
36
+ <?php if ($this->helper('tax')->displayFullSummary() && $_value!=0): ?>
37
+ <?php $isTop = 1; ?>
38
+ <?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
39
+ <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
40
+ <?php $percent = $info['percent']; ?>
41
+ <?php $amount = $info['amount']; ?>
42
+ <?php $rates = $info['rates']; ?>
43
+ <?php $isFirst = 1; ?>
44
+
45
+ <?php foreach ($rates as $rate): ?>
46
+ <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
47
+ <td class="a-right" style="<?php echo $_style ?>" colspan="<?php echo $this->getColspan(); ?>">
48
+ <?php echo $this->escapeHtml($rate['title']); ?>
49
+ <?php if (!is_null($rate['percent'])): ?>
50
+ (<?php echo (float)$rate['percent']; ?>%)
51
+ <?php endif; ?>
52
+ <br />
53
+ </td>
54
+ <?php if ($isFirst): ?>
55
+ <td style="<?php echo $_style ?>" class="a-right" rowspan="<?php echo count($rates); ?>">
56
+ <?php echo $this->helper('checkout')->formatPrice($amount); ?>
57
+ </td>
58
+ <?php endif; ?>
59
+ </tr>
60
+ <?php $isFirst = 0; ?>
61
+ <?php $isTop = 0; ?>
62
+ <?php endforeach; ?>
63
+ <?php endforeach; ?>
64
+ <?php $weees = $this->getAllWeee(); ?>
65
+ <?php foreach ($weees as $weeeTitle => $weeeAmount): ?>
66
+ <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
67
+ <td class="a-right" style="<?php echo $_style ?>" colspan="<?php echo $this->getColspan(); ?>">
68
+ <?php echo $this->escapeHtml($weeeTitle); ?>
69
+ <br />
70
+ </td>
71
+ <td style="<?php echo $_style ?>" class="a-right" rowspan="1">
72
+ <?php echo $this->helper('checkout')->formatPrice($weeeAmount); ?>
73
+ </td>
74
+ </tr>
75
+ <?php endforeach; ?>
76
+ <?php endif;?>
77
+ <tr <?php if ($this->helper('tax')->displayFullSummary() && $_value!=0): ?> class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?>>
78
+ <td style="<?php echo $_style ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
79
+ <?php if ($this->helper('tax')->displayFullSummary()): ?>
80
+ <div class="summary-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
81
+ <?php else: ?>
82
+ <?php echo $this->getTotal()->getTitle() ?>
83
+ <?php endif;?>
84
+ </td>
85
+ <td style="<?php echo $_style ?>" class="a-right"><?php echo $this->helper('checkout')->formatPrice($_value) ?></td>
86
+ </tr>
app/design/frontend/base/default/template/japi/checkout/onepage/style.phtml CHANGED
@@ -19,7 +19,7 @@ $customCss = Mage::getStoreConfig('japi/jmango_rest_checkout_settings/custom_css
19
  $TIGPostNLVersion = Mage::helper('japi')->getExtensionVersion('TIG_PostNL');
20
  ?>
21
  <link type="text/css" rel="stylesheet" media="all"
22
- href="<?php echo $this->getSkinUrl('japi/css/style.css?v=3.2.0') ?>"/>
23
 
24
  <?php if (Mage::helper('japi')->isModuleEnabled('GoMage_Checkout')): ?>
25
  <link type="text/css" rel="stylesheet" media="all"
19
  $TIGPostNLVersion = Mage::helper('japi')->getExtensionVersion('TIG_PostNL');
20
  ?>
21
  <link type="text/css" rel="stylesheet" media="all"
22
+ href="<?php echo $this->getSkinUrl('japi/css/style.css?v=3.3.2') ?>"/>
23
 
24
  <?php if (Mage::helper('japi')->isModuleEnabled('GoMage_Checkout')): ?>
25
  <link type="text/css" rel="stylesheet" media="all"
app/design/frontend/base/default/template/japi/customer/form/additional.phtml ADDED
@@ -0,0 +1,12 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Copyright 2017 JMango360
4
+ */
5
+ ?>
6
+ <?php if (strpos(Mage::getUrl(), 'voordeelwijnen.nl')): ?>
7
+ <li>
8
+ <p>Om te kunnen bestellen moet u 18 jaar of ouder zijn.</p>
9
+ <input type="checkbox" name="16year" id="yearcheck" class="required-entry"/>
10
+ <label for="yearcheck">Ja, ik ben 18 jaar of ouder.</label>
11
+ </li>
12
+ <?php endif; ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Jmango360_Japi</name>
4
- <version>3.3.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
7
  <channel>community</channel>
@@ -31,9 +31,9 @@ Other generic mobile apps that you can add and configure:&#xD;
31
  For more details on JMango360 please visit our website http://www.jmango360.com or out knowledge site http://support.jmango360.com</description>
32
  <notes>* Bug fixes</notes>
33
  <authors><author><name>Duc Ngo</name><user>jmango360</user><email>duc@jmango360.com</email></author></authors>
34
- <date>2017-04-14</date>
35
- <time>09:55:22</time>
36
- <contents><target name="magecommunity"><dir name="Jmango360"><dir name="Japi"><dir name="Block"><dir name="Adminhtml"><dir name="Catalog"><dir name="Product"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Hide.php" hash="2e9fb95869151bb2a2c7cf7fca6f998f"/></dir></dir></dir></dir></dir><dir name="Order"><file name="Grid.php" hash="22273d3d0acaf1b0a093e524f87c6aff"/></dir><file name="Order.php" hash="04e94160608b989286aebeb190299565"/><dir name="Report"><dir name="Chart"><file name="Customers.php" hash="9a4c7c4af19c584aeb2dd5bc0f6d4735"/><file name="Orders.php" hash="ae5f516c56c5c8c72c14a7b0aa275ac6"/><file name="Sales.php" hash="7d5db491deeaa90571e965bbc2c07e23"/></dir><dir name="Customers"><file name="Chart.php" hash="69f2a7121d61f24d9b75de7281def8e5"/><file name="Grid.php" hash="f1adb7504646338330b7e7ef64a4fc5c"/></dir><file name="Customers.php" hash="6ffd72b1280b6cce39665fd35b5c4a78"/><dir name="Filter"><dir name="Form"><file name="Orders.php" hash="92574de82aa73cdd9de0cc59e20dadc4"/></dir><file name="Form.php" hash="7bf3f161f66abf97fc7db57e0acd59cf"/></dir><dir name="Orders"><file name="Chart.php" hash="75bd0bbe8649f423918dec555d3e9592"/><file name="Grid.php" hash="35590c1a54c8490c3982f0df038b8328"/></dir><file name="Orders.php" hash="6416ac5f6889d5a06f2a32f5ff00cbe2"/><dir name="Sales"><file name="Chart.php" hash="416f4ff4cdaa7f8f099dad3ffccacd68"/><file name="Grid.php" hash="baa9caa57906627ed3f31ec4fd87a500"/></dir><file name="Sales.php" hash="c1d1df3e7b90451e42142bb414a28d6b"/></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="2b02a6c90256c9bcc6d99d2d9301413e"/><file name="Log.php" hash="d92a34eab2fbac5dc45ad12fc7df11ed"/><file name="User.php" hash="cb7dfc72c7acde78efbabc49617cba3c"/><file name="Version.php" hash="b9802c302ef7ecacf106993e8506d314"/></dir></dir></dir><dir name="Widget"><dir name="Form"><dir name="Renderer"><dir name="Element"><file name="Chart.php" hash="f6f4c2ff80cb71f3e0758809b8ad480d"/></dir></dir></dir></dir></dir><file name="Banner.php" hash="0cafa22b3012e1a3b39f0e72a03534fa"/><dir name="Catalog"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="43581de27feb1a0187bb0aee68bab0e9"/><file name="Category.php" hash="5d01fc7d90af7eccd412ef61056b825b"/><file name="Decimal.php" hash="d40a09709bda7b1011e4d2c970308638"/><file name="Price.php" hash="02dfe6d9429f0190ecf9a41f73653330"/></dir><file name="View.php" hash="e217dfaf2a2ee6c2fa59ba9db0244eb9"/></dir><dir name="Product"><file name="List.php" hash="e1336372e4aa63e0e35c7e9ea1bd3852"/></dir></dir><dir name="Catalogsearch"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="4ba3d242a3343b1786cf081047650bb9"/></dir></dir><file name="Layer.php" hash="4d48db1a2b35151c363ed045646199a9"/></dir><dir name="Checkout"><dir name="Cart"><file name="Totals.php" hash="7aced913b0e0cd1622dd8d03b376327d"/></dir><dir name="Onepage"><file name="Addjs.php" hash="077d09b15ec8823c76854a575359cb1a"/><file name="Address.php" hash="bf596c77e982d4350fc532a3deb79e47"/><file name="Billing.php" hash="afc74029a0b8d571e440f50a04ab4340"/><file name="Button.php" hash="039d56b9b7982d5e32433d71f4b53959"/><file name="Shipping.php" hash="aaa1b70ecc095d297d6ab0a90f441c70"/></dir><file name="Onepage.php" hash="b02fe40ae9c73c0d1248c178a4f2d133"/></dir><file name="Form.php" hash="e16eaa258cf650bd2106372fcf43ae9b"/><dir name="GiftMessage"><dir name="Message"><file name="Inline.php" hash="8f20e9383634f46b624f15d77b616380"/></dir></dir><file name="Js.php" hash="8e8091283a5a3142fec7486077a9586e"/></dir><dir name="Controller"><file name="Abstract.php" hash="ccb6cc7460e7bbf30293983bbe61a07d"/></dir><file name="Exception.php" hash="bd30a2efecdf9a8197f066d9574cd1ab"/><dir name="Helper"><dir name="Adminhtml"><dir name="Report"><file name="Order.php" hash="9f7a02c48f3f8e0545488375b03d7333"/></dir></dir><file name="Data.php" hash="6edd0c13a0e16f60f899c8cbfe9f5df8"/><file name="Debug.php" hash="1002a59a5dee41f34da875979e907cbf"/><dir name="GiftMessage"><file name="Message.php" hash="5d1df4710b0aa3154ce0fa744b0244f3"/></dir><file name="Js.php" hash="55565b7d668b993fae6c180b30766d17"/><dir name="Product"><file name="Bundle.php" hash="c89baf5638e81d030f5a72b011af7cfd"/><file name="Configurable.php" hash="58c1e0b70c30346839e236e7346a24bd"/><file name="Downloadable.php" hash="db531632adda525a91625da8d13296d6"/><file name="File.php" hash="0968c5688015b9c7a002457428607f80"/><file name="Grouped.php" hash="82db4c3d5b6ba987004a653729013149"/><file name="Media.php" hash="291003011bdca7299280ef0136089edf"/><file name="Options.php" hash="1bc8973b5a9227b0b7de93f2307c7fb9"/><file name="Review.php" hash="e415a0215a8dfbdac5ed76e6c065c705"/><file name="TierPrice.php" hash="4a7e94d83eed9e7ba47ee196b4ae15d9"/></dir><file name="Product.php" hash="f75c5ed6faacfd3346cd4d3c1352d60f"/><dir name="Review"><file name="Bazaarvoice.php" hash="db89feba62126e98b56c2e3b68980f23"/></dir><file name="Tax.php" hash="05c99785012d55fce12c4f094385e25c"/></dir><dir name="Model"><dir name="Catalog"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="f058e0ced4579a556cbb969a98c7fc66"/><file name="Decimal.php" hash="849e1dbc11c99fb8f7a1f9d33e0d7908"/><file name="Price.php" hash="2bdc6f1ff06ad5aa736972c72558fd25"/></dir></dir></dir><dir name="Catalogsearch"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="81b287f96c40094c2a3743ddc6f6c6cb"/></dir></dir></dir><dir name="Core"><file name="Session.php" hash="7c5531af03c6a98e14dda3d358270938"/></dir><file name="Dispatcher.php" hash="81004902926427ba06a1a90d6e799554"/><dir name="Magpleasure"><dir name="Tierprices"><file name="Price.php" hash="1bfd6ed086649f518b3e98436513a491"/></dir></dir><dir name="Observer"><dir name="Controller"><file name="Front.php" hash="1098d9b5f6a214e53fb8657fe1fd250d"/></dir></dir><file name="Observer.php" hash="c19a6c0209260aad4d56b76672d70826"/><dir name="Renderer"><file name="Json.php" hash="b7c471548eecae7c9d05072aa6695cbb"/></dir><file name="Renderer.php" hash="47c320f795f1328a8df37d4b9af56abc"/><file name="Request.php" hash="ece58a0074c2ba238c102983e05d15a8"/><dir name="Resource"><dir name="Catalog"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="5bd13fbb5e8012ad24dc7908bc5ea755"/><file name="Decimal.php" hash="551120b728226ed408292fac732a05d7"/><file name="Price.php" hash="321f70b515b4d3deb9c7cc58eb803bf2"/></dir></dir></dir><dir name="Report"><dir name="Order"><file name="Collection.php" hash="1c5e69f548f2b4a0da8f789d7d03b643"/></dir></dir><dir name="Sales"><dir name="Report"><dir name="Order"><dir name="Collection"><file name="Aggregated.php" hash="61848c0b80699acbf478f279231c161d"/><file name="Live.php" hash="ea323ca0eec324ece97f08ece6639fb9"/></dir></dir><file name="Order.php" hash="53641b24d23bd811c278f65b56d5765f"/></dir></dir><file name="Setup.php" hash="3a97ea2e652869965f5b47b9e3099896"/></dir><file name="Response.php" hash="7209bb2e9c5b97b2a46d10ff97aa6740"/><dir name="Rest"><dir name="Cart"><file name="Coupon.php" hash="a5be6cfe674b46b6ba290b0388edf8ad"/><file name="Update.php" hash="71dccaac258d2e9c584ac6b35c72621e"/></dir><file name="Cart.php" hash="39e0f2f2b7630e5884d907f42bc5e11a"/><dir name="Catalog"><dir name="Category"><file name="Assignedproducts.php" hash="7658ab222c320e1f86f7ce0876ed5a28"/><file name="Tree.php" hash="5dce196312e33d3f7ac4a2235312e587"/></dir><dir name="Search"><file name="Products.php" hash="8b8f43f4f563dc27002884a57d42c858"/><file name="Terms.php" hash="71cadbe1fa7b19c96f2201f087c832ff"/></dir></dir><file name="Catalog.php" hash="a71eed5f39431b40a80b06f566baa653"/><dir name="Checkout"><file name="Methods.php" hash="ce5e08ab2b5cf944c5b6b9ccc25773e0"/><file name="Onepage.php" hash="e1e04e5936867fe452a08ee5774617bf"/><file name="Redirect.php" hash="19932aa45299e5ea3995f52cb9987183"/><file name="Submit.php" hash="50ac35f8218f5c3abeb0946e138db2ae"/></dir><file name="Checkout.php" hash="514f5be707f0a1a1175b825983831705"/><dir name="Cms"><file name="Page.php" hash="93bd77b2b3f2b8b1e72a3e6391553426"/></dir><file name="Cms.php" hash="a12fd4b2a437c8a6c0b2b65a1e471c23"/><dir name="Customer"><file name="Address.php" hash="cef92ca089a5cd7cd1218339104c4894"/><file name="Edit.php" hash="226f77d8cee872c4c622c062cfe1eff0"/><file name="Group.php" hash="c717d5faf52919787aa0f87270856ca3"/><file name="List.php" hash="17f0096755be01327c163a701b9f3780"/><file name="Login.php" hash="77df1e0afcf40e6129fb61397217f053"/><dir name="Order"><file name="List.php" hash="1e6ea53a87108ca487d9a58ac42f382f"/></dir><file name="Order.php" hash="da1565601bac963b72f64b0e6a147704"/><file name="Password.php" hash="6df128903742a8723f0a59c4203f8b12"/><file name="Register.php" hash="e25d0045e0d8ff650ca208b9fe75e3ae"/></dir><file name="Customer.php" hash="ecf57dcf8bbba1ebb12ed10630bd1715"/><file name="Mage.php" hash="7082fc751e2aad8ba041c92dd93fff01"/><dir name="Product"><file name="Crosssell.php" hash="1fbc8c3886de3703a77e911ac459422c"/><file name="List.php" hash="8d84ec9326a6747de6d2ca0a5aceee6c"/><file name="Price.php" hash="d47c9903d5719b0cee73836419e27bb1"/><file name="Purchased.php" hash="feb7fd9176da74e59722984732d04a9a"/><file name="Related.php" hash="8a6b52fc39f099f4339a91ad5709537a"/><file name="Review.php" hash="549ffdfaea3d95ac1f18e9d4ef18d6eb"/><file name="Search.php" hash="9e130de2d112ee567b4756b63b050809"/><file name="Upsell.php" hash="56a4075e88a75d1cfa89e7da1130a2b4"/><file name="Url.php" hash="4b920cc4913b77b1e463afad27ad5b78"/><file name="Viewed.php" hash="c2a9c99a56b57d8288eec75657f9bd47"/></dir><file name="Product.php" hash="33f395e10d5578d948bf32a7bd5388fd"/><file name="Wishlist.php" hash="ee26b4efcbf3b2c39aec2c1e3402c35b"/></dir><file name="Server.php" hash="1f51d81e323af28fd78618e62db11d82"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Icon.php" hash="242de9b094f94e397dc606dc926cc33f"/><file name="Payment.php" hash="5964322419785004a6c3f84a940d8d13"/><file name="Shipping.php" hash="016f22646fbac10cd81c6b7904c9abde"/></dir><dir name="Source"><dir name="Address"><file name="Attributes.php" hash="1a29b64d271693fba3ea76599d3408e2"/><file name="Validatetype.php" hash="6f4d9767ac0e476ec6a6cd3964882721"/></dir><file name="Attributes.php" hash="4b4de29e00623c971038d6fe895e5e76"/><dir name="Bazaarvoice"><file name="Env.php" hash="bc619503d1b175e74f7eaf2ba15ae8b4"/></dir><dir name="Catalog"><file name="Direction.php" hash="68cd86444037506ec39de8eba3c07d8b"/><file name="Sortby.php" hash="d2aba9a3798b8e2eee8c275fbbd202e1"/></dir><file name="Catalogimage.php" hash="500f9994ea13e463a5e5e5d3963cfbd1"/><dir name="Customer"><file name="Attributes.php" hash="8963356aabf88647ab5ecbbbe8cfb9f1"/></dir><file name="Defaultimage.php" hash="04c896116c01b16e2ac8d7f23bbc29d6"/><file name="Payment.php" hash="70e82f4887eb297d6a58160f64bfd204"/><file name="Shipping.php" hash="7d8e5a2dc8a57099d908bef2403aad46"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Japi"><file name="LogController.php" hash="b17e024285aea7b6834cf5bc9b868916"/><file name="OrderController.php" hash="e6b7c1f5a7156a06fa3f51c32e6bbba9"/><file name="ReportController.php" hash="e88b2425e0a39f7f2b0c2902a6d2d5e9"/><file name="TroubleshootingController.php" hash="bb8951d1523a56a0f55e827614a38d66"/></dir></dir><file name="CheckoutController.php" hash="8353c64f00e22143bfc5264bcdc07998"/><dir name="Customer"><file name="AccountController.php" hash="2e055c5b22a2414263a1b7d3fd0607f9"/></dir><file name="CustomerController.php" hash="1336f9ccebf73e6e8f69d33503cd2bd7"/><file name="ImageController.php" hash="a5b48d4e075faf989c908bd0954d3878"/><file name="KcoController.php" hash="38e15112f3438edd6723478cf18c6cab"/><file name="KlarnaController.php" hash="fafb22cc7b5e2f69ee3dfb9094a04dcd"/><dir name="Rest"><file name="CartController.php" hash="3994aafe8e31094b765fc0120c888fa3"/><file name="CatalogController.php" hash="8df5b798bb0330f5e3182717e1e15bf7"/><file name="CheckoutController.php" hash="2fd4a4bca1a37788616645f50392a701"/><file name="CmsController.php" hash="cb1bc3f67136434c4d8af1b5660eab1e"/><file name="CustomerController.php" hash="ca2b76f8f4e8a84d81749b37910287bd"/><file name="MageController.php" hash="e267156b2acf82d309b6c8c4680a7371"/><file name="ProductController.php" hash="81c0a0b0afcdfe99d6c651244baa075c"/><file name="WishlistController.php" hash="d7b0c8ff628b4244d120843d54a41248"/></dir><file name="TestController.php" hash="ffb60653808c0e0af00cc73d4755ef99"/></dir><dir name="data"><dir name="japi_setup"><file name="data-install-2.0.0.php" hash="bcf6de66f6b296182268b11b3e80bbeb"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="9d1888abb4ed93ec7b3e1fa678fb1411"/><file name="config.xml" hash="56b4184fb3b3ed8713bf1c857fdcd849"/><file name="system.xml" hash="2bc606025d6a5f2f656fbbb9da9b1b4f"/></dir><dir name="sql"><dir name="japi_setup"><file name="install-1.0.0.php" hash="ce407ff5715c837d02b1aba7975bf512"/><file name="upgrade-2.0.1.2-2.0.2.php" hash="6fc0e0306b685279fc60f298643d181a"/><file name="upgrade-2.1.6-2.2.0.php" hash="947afcf7e20dfc2c3a3e45d8e5c316cd"/><file name="upgrade-2.2.0-2.2.1.php" hash="12a28845acf823eefc5f613b048efe52"/><file name="upgrade-2.8.2-2.9.0.php" hash="2761423f65920af0f8ba05d438710869"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Jmango360_Japi.xml" hash="b60701b3a14084fa1a440ca5fe5bf47b"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="jmango360_japi.xml" hash="d6e1656e4a8e79dd9e37e0b09a5f57a6"/></dir><dir name="template"><dir name="japi"><dir name="report"><file name="chart.phtml" hash="102704d97cf69793a50fa96538bd767f"/><dir name="grid"><file name="container.phtml" hash="79050f4e2bc7b70ae452e850fc27e0b7"/></dir></dir><dir name="widget"><dir name="form"><dir name="renderer"><dir name="element"><file name="chart.phtml" hash="fb14be221a9ec0faad4ace8579c5dddc"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="jmango360_japi.xml" hash="4f560dae03a2dbcb5901395a55031c1e"/></dir><dir name="template"><dir name="japi"><dir name="TIG"><dir name="PostNL"><dir name="av"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="0cb781955d33fae46da09d62bd6fdaf3"/><file name="shipping.phtml" hash="cb72f56f0d26171c429d7a70701e0913"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="9a623e8c2184d08c2b288456ba50aef4"/><file name="postcode_check.phtml" hash="cbb8bfd76db65041cafacf976312ceb7"/></dir></dir></dir><dir name="do"><dir name="onepage"><file name="available.phtml" hash="8fce41a1696540a4546b52c025f3dde7"/></dir></dir></dir></dir><dir name="checkout"><dir name="onepage"><file name="additional_agreements.phtml" hash="b1c6e10e1227321e38346110b37e6c57"/><file name="address.phtml" hash="3164ff4fc2d5f798e591a168d9d937d1"/><file name="agreements.phtml" hash="ae43c3b670b0d11a1217ca927a184ff7"/><file name="billing.phtml" hash="d5491399cbce3e565757023dc3e594ed"/><file name="coupon.phtml" hash="a27beeba5f8b2160dccc6d4198c6517d"/><file name="js.phtml" hash="ac1740fe3e829d228a57b1e1a9dda58b"/><dir name="payment"><file name="info.phtml" hash="26bb640843ee3fb6e72b4f2739f0a111"/><file name="methods.phtml" hash="1680b5e33d8123fdb58ecbd353ff1ba7"/></dir><file name="payment.phtml" hash="cc3bfd21f2a141ea403db094e1264781"/><dir name="review"><file name="button.phtml" hash="e2089ae34e409df2fa13977a55db5f04"/><file name="info.phtml" hash="54ea567e7273a0942fcdddfb95340e8e"/><file name="item.phtml" hash="244bba60d9151be71777e80e138b6ee7"/><file name="totals.phtml" hash="0decbe242701193fee270e1f0f520a93"/></dir><file name="review.phtml" hash="d2494b8faac5833e747a5d329ee4fab7"/><file name="shipping.phtml" hash="d0aba8dade93f6798285f7163ec65e58"/><dir name="shipping_method"><file name="additional.phtml" hash="78c6dab72fefb888f587221639bf9177"/><file name="available.phtml" hash="4feca53deabec45bc3b223e64e32c4f0"/></dir><file name="shipping_method.phtml" hash="edc75d0aecc103ed69b216ef76bc6af2"/><file name="style.phtml" hash="3a5e56f8a42b81291ae25beb36a0994a"/></dir><file name="onepage.phtml" hash="733ad23bfa6442a5fcab8c9a6bbf1b88"/></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="900db1b8385f75e448f7ca42c8d113da"/></dir><dir name="form"><file name="edit.phtml" hash="484b2b56cbf34dba73c78dc97552c024"/><file name="register.phtml" hash="978dc0d67f796c90e8675cbaec1a06ba"/></dir></dir><dir name="fatturazione"><dir name="customer"><dir name="address"><file name="edit.phtml" hash="e7f27a8a61d9554bfbc4f36dfff60e4d"/></dir></dir></dir><file name="form.phtml" hash="eec0416c8830c4ebe004256d86c7ea59"/><dir name="giftmessage"><file name="inline.phtml" hash="78814da47aed68315b7d1d6b2e64c4c7"/></dir><file name="js.phtml" hash="9af5ac67d9b1a4fc689084e135215f99"/><dir name="kega_checkout"><dir name="onepage"><file name="payment.phtml" hash="36ceb7a03629f08c789f42e98b1c1535"/></dir></dir><dir name="nwt"><dir name="kco"><dir name="cart"><dir name="item"><file name="default.phtml" hash="212018e8f0c4472a07fc81633d27c550"/></dir></dir><file name="checkout.phtml" hash="c7781347405e7e59322d9fc3b2f42b3c"/></dir></dir><dir name="page"><dir name="html"><file name="head.phtml" hash="b6a8cc30cd31bf642c2f885ed1fda855"/><file name="smart-app-banner.phtml" hash="8423731f246db33efb61026dd9ef5ddc"/></dir><file name="rwd.phtml" hash="06c53b02ad843574b22a803a709988f6"/></dir><dir name="symfony"><dir name="postcode"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="65181e0ab40a40671f35c54bc25b99af"/><file name="shipping.phtml" hash="a6e2a192b9998889e5d113a92df62623"/></dir></dir></dir></dir><dir name="vaimo"><dir name="klarna"><dir name="klarnacheckout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="f9f469de9cd1243cab176fc56071db64"/></dir></dir><file name="cart.phtml" hash="b40f17348beb248c4f1ff22374a1a05d"/><dir name="customer"><file name="balance.phtml" hash="198809cb8ebf8a468b89497c9abba07c"/></dir><dir name="discount"><file name="coupon.phtml" hash="1f3686b00a610d3f038c84e3621ef913"/></dir><file name="header.phtml" hash="fed93df0c84265a0f980b0de103945b8"/><file name="main.phtml" hash="94ad4f3aa30ae7db1131a1fe48ea2a99"/><file name="newsletter.phtml" hash="3a2251b9559e8b87b46ddf08b7cd27e2"/><file name="reward.phtml" hash="38c218d3777f11b03c3686067a706d00"/><file name="shipping_method.phtml" hash="44bb3c6efaab76641e02a07c2007a090"/><file name="sidebar.phtml" hash="410508fd9089e0be030915836abb42e2"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="japi"><dir name="css"><dir name="TIG"><dir name="Buckaroo3Extended"><file name="styles_opc.css" hash="9b0ecbbeb22655e2e896ec8134fa8188"/></dir></dir><file name="gomage-checkout.css" hash="223657dbb0aba2783bb9e8de4b633d93"/><dir name="icomoon"><dir name="fonts"><file name="icomoon.eot" hash="842065e274d718c38968a81a721d49f4"/><file name="icomoon.svg" hash="2deea3fcd9ecc464a422aa37943b5848"/><file name="icomoon.ttf" hash="8ffbfccd78de7c37eadeca837ee40344"/><file name="icomoon.woff" hash="32df67c3aed8769c316b3e7ff1bb637c"/></dir><file name="style.css" hash="178c956df2a327dc88e4ef8069caa9bc"/></dir><file name="send-cloud.css" hash="77f77fa89359fe508708ec522a5e76d8"/><file name="style.css" hash="352295713663485a3c816fe968cd6776"/><file name="style.less" hash="86c48a0573409f7d0431724421120cc0"/></dir><dir name="images"><file name="ajax-loader.gif" hash="f48ee069890b16455c3ddcacee9b5f75"/><file name="bg-down.png" hash="04d7cd2963010b610f608aca03a45c63"/><file name="bg-up.png" hash="2882d38108532275fb1d425bbd021c9d"/><file name="glc_sprite.png" hash="5cd6f3ba1df3a6d26db5bbc193ce9c61"/></dir><dir name="js"><file name="checkout.js" hash="ea1217fcd211b050d86a58ad55e89320"/><dir name="vaimo"><dir name="klarna"><file name="klarnautils.js" hash="e29553aa8446af7672c9ba1814fac3a5"/></dir></dir><dir name="varien"><file name="form.js" hash="9abc0bb4419828513b5c6e904a041616"/></dir></dir><dir name="lib"><dir name="bootstrap"><dir name="css"><file name="bootstrap.min.css" hash="5d5357cb3704e1f43a1f5bfed2aebf42"/></dir><dir name="fonts"><file name="glyphicons-halflings-regular.eot" hash="f4769f9bdb7466be65088239c12046d1"/><file name="glyphicons-halflings-regular.svg" hash="89889688147bd7575d6327160d64e760"/><file name="glyphicons-halflings-regular.ttf" hash="e18bbf611f2a2e43afc071aa2f4e1512"/><file name="glyphicons-halflings-regular.woff" hash="fa2772327f55d8198301fdb8bcfc8158"/><file name="glyphicons-halflings-regular.woff2" hash="448c34a56d699c29117adc64c43affeb"/></dir><dir name="js"><file name="collapse.js" hash="2bc99ca6c9b060ba5616f41ddd5e2703"/><file name="modal.js" hash="b7d8f688e67e78c07ffde44ec4248fd9"/><file name="transition.js" hash="3cb001675410903ecaadcfeb7c296965"/></dir></dir><dir name="jquery"><file name="jquery-1.11.2.min.js" hash="5790ead7ad3ba27397aedfa3d263b867"/><file name="jquery-noconflict.js" hash="32eb0a33820167f328a227e11210d32a"/></dir><dir name="ladda"><file name="ladda.min.css" hash="614e769024385cf21879d6a238b682e1"/><file name="ladda.min.js" hash="a34bcf417de7fc290ac5b034caca2371"/></dir><dir name="scrollto"><file name="scrollTo.js" hash="5c86793da8a4bfec6338bec965d35f6b"/></dir><dir name="smart-app-banner"><file name="smart-app-banner.css" hash="64c15053dbd22b44a519f55e75f6c2ca"/><file name="smart-app-banner.js" hash="4162cb20424080964b5d886125b73b47"/></dir><dir name="spin"><file name="spin.min.js" hash="1d06ceb800acbeae82d1fa2ad5b571de"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Jmango360_Japi.csv" hash="3ecbadafe75c076e087389e527c2fa4e"/></dir><dir name="fr_FR"><file name="Jmango360_Japi.csv" hash="18a1f2a8dfca8ba4a2cb98d2e7deb0a1"/></dir><dir name="it_IT"><file name="Jmango360_Japi.csv" hash="2ff891468a5c5fe0bd3775cc155341cb"/></dir><dir name="pt_PT"><file name="Jmango360_Japi.csv" hash="3a70c94cf76ccf0649ab2c525f2acece"/></dir><dir name="pt_BR"><file name="Jmango360_Japi.csv" hash="3a70c94cf76ccf0649ab2c525f2acece"/></dir><dir name="ar_SA"><file name="Jmango360_Japi.csv" hash="25b829fa5515c567af7ed8e5e4a2690a"/></dir><dir name="nl_NL"><file name="Jmango360_Japi.csv" hash="f37b336b47a320803a967237a7765a2a"/></dir><dir name="sv_SE"><file name="Jmango360_Japi.csv" hash="3414d54579206e71cabaaea3153bc266"/></dir><dir name="da_DK"><file name="Jmango360_Japi.csv" hash="a8f243d230a312f4d5cee8c99a275ee7"/></dir><dir name="es_ES"><file name="Jmango360_Japi.csv" hash="0f763b984f64e095f863c2e66335c791"/></dir><dir name="de_DE"><file name="Jmango360_Japi.csv" hash="d97408dc0ece1a193669bc491798355a"/></dir></target></contents>
37
  <compatible/>
38
  <dependencies><required><php><min>5.2.0</min><max>7.1.0</max></php></required></dependencies>
39
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Jmango360_Japi</name>
4
+ <version>3.3.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
7
  <channel>community</channel>
31
  For more details on JMango360 please visit our website http://www.jmango360.com or out knowledge site http://support.jmango360.com</description>
32
  <notes>* Bug fixes</notes>
33
  <authors><author><name>Duc Ngo</name><user>jmango360</user><email>duc@jmango360.com</email></author></authors>
34
+ <date>2017-04-25</date>
35
+ <time>08:49:25</time>
36
+ <contents><target name="magecommunity"><dir name="Jmango360"><dir name="Japi"><dir name="Block"><dir name="Adminhtml"><dir name="Catalog"><dir name="Product"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Hide.php" hash="2e9fb95869151bb2a2c7cf7fca6f998f"/></dir></dir></dir></dir></dir><dir name="Order"><file name="Grid.php" hash="22273d3d0acaf1b0a093e524f87c6aff"/></dir><file name="Order.php" hash="04e94160608b989286aebeb190299565"/><dir name="Report"><dir name="Chart"><file name="Customers.php" hash="9a4c7c4af19c584aeb2dd5bc0f6d4735"/><file name="Orders.php" hash="ae5f516c56c5c8c72c14a7b0aa275ac6"/><file name="Sales.php" hash="7d5db491deeaa90571e965bbc2c07e23"/></dir><dir name="Customers"><file name="Chart.php" hash="69f2a7121d61f24d9b75de7281def8e5"/><file name="Grid.php" hash="f1adb7504646338330b7e7ef64a4fc5c"/></dir><file name="Customers.php" hash="6ffd72b1280b6cce39665fd35b5c4a78"/><dir name="Filter"><dir name="Form"><file name="Orders.php" hash="92574de82aa73cdd9de0cc59e20dadc4"/></dir><file name="Form.php" hash="7bf3f161f66abf97fc7db57e0acd59cf"/></dir><dir name="Orders"><file name="Chart.php" hash="75bd0bbe8649f423918dec555d3e9592"/><file name="Grid.php" hash="35590c1a54c8490c3982f0df038b8328"/></dir><file name="Orders.php" hash="6416ac5f6889d5a06f2a32f5ff00cbe2"/><dir name="Sales"><file name="Chart.php" hash="416f4ff4cdaa7f8f099dad3ffccacd68"/><file name="Grid.php" hash="baa9caa57906627ed3f31ec4fd87a500"/></dir><file name="Sales.php" hash="c1d1df3e7b90451e42142bb414a28d6b"/></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="2b02a6c90256c9bcc6d99d2d9301413e"/><file name="Log.php" hash="d92a34eab2fbac5dc45ad12fc7df11ed"/><file name="User.php" hash="cb7dfc72c7acde78efbabc49617cba3c"/><file name="Version.php" hash="b9802c302ef7ecacf106993e8506d314"/></dir></dir></dir><dir name="Widget"><dir name="Form"><dir name="Renderer"><dir name="Element"><file name="Chart.php" hash="f6f4c2ff80cb71f3e0758809b8ad480d"/></dir></dir></dir></dir></dir><file name="Banner.php" hash="0cafa22b3012e1a3b39f0e72a03534fa"/><dir name="Catalog"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="43581de27feb1a0187bb0aee68bab0e9"/><file name="Category.php" hash="5d01fc7d90af7eccd412ef61056b825b"/><file name="Decimal.php" hash="d40a09709bda7b1011e4d2c970308638"/><file name="Price.php" hash="02dfe6d9429f0190ecf9a41f73653330"/></dir><file name="View.php" hash="e217dfaf2a2ee6c2fa59ba9db0244eb9"/></dir><dir name="Product"><file name="List.php" hash="e1336372e4aa63e0e35c7e9ea1bd3852"/></dir></dir><dir name="Catalogsearch"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="4ba3d242a3343b1786cf081047650bb9"/></dir></dir><file name="Layer.php" hash="4d48db1a2b35151c363ed045646199a9"/></dir><dir name="Checkout"><dir name="Cart"><file name="Totals.php" hash="ed2ac76f7ebb2830c763deb80e1ea59e"/></dir><dir name="Onepage"><file name="Additional.php" hash="22a3c60e8fd44f5dfaec4b51d6fc1a62"/><file name="Addjs.php" hash="077d09b15ec8823c76854a575359cb1a"/><file name="Address.php" hash="bf596c77e982d4350fc532a3deb79e47"/><file name="Billing.php" hash="afc74029a0b8d571e440f50a04ab4340"/><file name="Button.php" hash="039d56b9b7982d5e32433d71f4b53959"/><file name="Shipping.php" hash="aaa1b70ecc095d297d6ab0a90f441c70"/></dir><file name="Onepage.php" hash="b02fe40ae9c73c0d1248c178a4f2d133"/><dir name="Total"><file name="Grandtotal.php" hash="0714677162e5c6e0ca9e1076083ee26e"/><file name="Shipping.php" hash="1bb99456f936de791df3b1e9cb4103d5"/><file name="Subtotal.php" hash="aa7cdd3b66df0ea397ad909848234a0e"/><file name="Tax.php" hash="91c12499a56a034d4733f8040feb7156"/></dir></dir><file name="Form.php" hash="e16eaa258cf650bd2106372fcf43ae9b"/><dir name="GiftMessage"><dir name="Message"><file name="Inline.php" hash="8f20e9383634f46b624f15d77b616380"/></dir></dir><file name="Js.php" hash="8e8091283a5a3142fec7486077a9586e"/></dir><dir name="Controller"><file name="Abstract.php" hash="ccb6cc7460e7bbf30293983bbe61a07d"/></dir><file name="Exception.php" hash="bd30a2efecdf9a8197f066d9574cd1ab"/><dir name="Helper"><dir name="Adminhtml"><dir name="Report"><file name="Order.php" hash="9f7a02c48f3f8e0545488375b03d7333"/></dir></dir><file name="Data.php" hash="6edd0c13a0e16f60f899c8cbfe9f5df8"/><file name="Debug.php" hash="1002a59a5dee41f34da875979e907cbf"/><dir name="GiftMessage"><file name="Message.php" hash="5d1df4710b0aa3154ce0fa744b0244f3"/></dir><file name="Js.php" hash="55565b7d668b993fae6c180b30766d17"/><dir name="Product"><file name="Bundle.php" hash="c89baf5638e81d030f5a72b011af7cfd"/><file name="Configurable.php" hash="58c1e0b70c30346839e236e7346a24bd"/><file name="Downloadable.php" hash="db531632adda525a91625da8d13296d6"/><file name="File.php" hash="0968c5688015b9c7a002457428607f80"/><file name="Grouped.php" hash="82db4c3d5b6ba987004a653729013149"/><file name="Media.php" hash="291003011bdca7299280ef0136089edf"/><file name="Options.php" hash="1bc8973b5a9227b0b7de93f2307c7fb9"/><file name="Review.php" hash="e415a0215a8dfbdac5ed76e6c065c705"/><file name="TierPrice.php" hash="4a7e94d83eed9e7ba47ee196b4ae15d9"/></dir><file name="Product.php" hash="1abc48e5fa3e97db15969d7f0ef25831"/><dir name="Review"><file name="Bazaarvoice.php" hash="2836378cc7b469ba5bf95aa062d61912"/></dir><file name="Tax.php" hash="05c99785012d55fce12c4f094385e25c"/></dir><dir name="Model"><dir name="Catalog"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="f058e0ced4579a556cbb969a98c7fc66"/><file name="Decimal.php" hash="849e1dbc11c99fb8f7a1f9d33e0d7908"/><file name="Price.php" hash="2bdc6f1ff06ad5aa736972c72558fd25"/></dir></dir></dir><dir name="Catalogsearch"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="81b287f96c40094c2a3743ddc6f6c6cb"/></dir></dir></dir><dir name="Core"><file name="Session.php" hash="7c5531af03c6a98e14dda3d358270938"/></dir><file name="Dispatcher.php" hash="81004902926427ba06a1a90d6e799554"/><dir name="Magpleasure"><dir name="Tierprices"><file name="Price.php" hash="1bfd6ed086649f518b3e98436513a491"/></dir></dir><dir name="Observer"><dir name="Controller"><file name="Front.php" hash="1098d9b5f6a214e53fb8657fe1fd250d"/></dir></dir><file name="Observer.php" hash="c19a6c0209260aad4d56b76672d70826"/><dir name="Renderer"><file name="Json.php" hash="b7c471548eecae7c9d05072aa6695cbb"/></dir><file name="Renderer.php" hash="47c320f795f1328a8df37d4b9af56abc"/><file name="Request.php" hash="ece58a0074c2ba238c102983e05d15a8"/><dir name="Resource"><dir name="Catalog"><dir name="Layer"><dir name="Filter"><file name="Attribute.php" hash="5bd13fbb5e8012ad24dc7908bc5ea755"/><file name="Decimal.php" hash="551120b728226ed408292fac732a05d7"/><file name="Price.php" hash="321f70b515b4d3deb9c7cc58eb803bf2"/></dir></dir></dir><dir name="Report"><dir name="Order"><file name="Collection.php" hash="1c5e69f548f2b4a0da8f789d7d03b643"/></dir></dir><dir name="Sales"><dir name="Report"><dir name="Order"><dir name="Collection"><file name="Aggregated.php" hash="61848c0b80699acbf478f279231c161d"/><file name="Live.php" hash="ea323ca0eec324ece97f08ece6639fb9"/></dir></dir><file name="Order.php" hash="53641b24d23bd811c278f65b56d5765f"/></dir></dir><file name="Setup.php" hash="3a97ea2e652869965f5b47b9e3099896"/></dir><file name="Response.php" hash="7209bb2e9c5b97b2a46d10ff97aa6740"/><dir name="Rest"><dir name="Cart"><file name="Coupon.php" hash="a5be6cfe674b46b6ba290b0388edf8ad"/><file name="Update.php" hash="71dccaac258d2e9c584ac6b35c72621e"/></dir><file name="Cart.php" hash="39e0f2f2b7630e5884d907f42bc5e11a"/><dir name="Catalog"><dir name="Category"><file name="Assignedproducts.php" hash="7658ab222c320e1f86f7ce0876ed5a28"/><file name="Tree.php" hash="5dce196312e33d3f7ac4a2235312e587"/></dir><dir name="Search"><file name="Products.php" hash="8b8f43f4f563dc27002884a57d42c858"/><file name="Terms.php" hash="71cadbe1fa7b19c96f2201f087c832ff"/></dir></dir><file name="Catalog.php" hash="a71eed5f39431b40a80b06f566baa653"/><dir name="Checkout"><file name="Methods.php" hash="ce5e08ab2b5cf944c5b6b9ccc25773e0"/><file name="Onepage.php" hash="e1e04e5936867fe452a08ee5774617bf"/><file name="Redirect.php" hash="19932aa45299e5ea3995f52cb9987183"/><file name="Submit.php" hash="50ac35f8218f5c3abeb0946e138db2ae"/></dir><file name="Checkout.php" hash="514f5be707f0a1a1175b825983831705"/><dir name="Cms"><file name="Page.php" hash="93bd77b2b3f2b8b1e72a3e6391553426"/></dir><file name="Cms.php" hash="a12fd4b2a437c8a6c0b2b65a1e471c23"/><dir name="Customer"><file name="Address.php" hash="cef92ca089a5cd7cd1218339104c4894"/><file name="Edit.php" hash="226f77d8cee872c4c622c062cfe1eff0"/><file name="Group.php" hash="c717d5faf52919787aa0f87270856ca3"/><file name="List.php" hash="17f0096755be01327c163a701b9f3780"/><file name="Login.php" hash="77df1e0afcf40e6129fb61397217f053"/><dir name="Order"><file name="List.php" hash="1e6ea53a87108ca487d9a58ac42f382f"/></dir><file name="Order.php" hash="da1565601bac963b72f64b0e6a147704"/><file name="Password.php" hash="6df128903742a8723f0a59c4203f8b12"/><file name="Register.php" hash="e25d0045e0d8ff650ca208b9fe75e3ae"/></dir><file name="Customer.php" hash="ecf57dcf8bbba1ebb12ed10630bd1715"/><file name="Mage.php" hash="7082fc751e2aad8ba041c92dd93fff01"/><dir name="Product"><file name="Crosssell.php" hash="1fbc8c3886de3703a77e911ac459422c"/><file name="List.php" hash="8d84ec9326a6747de6d2ca0a5aceee6c"/><file name="Price.php" hash="d47c9903d5719b0cee73836419e27bb1"/><file name="Purchased.php" hash="feb7fd9176da74e59722984732d04a9a"/><file name="Related.php" hash="8a6b52fc39f099f4339a91ad5709537a"/><file name="Review.php" hash="549ffdfaea3d95ac1f18e9d4ef18d6eb"/><file name="Search.php" hash="9e130de2d112ee567b4756b63b050809"/><file name="Upsell.php" hash="319fe08a0a4c52c41ec4418b312e1842"/><file name="Url.php" hash="4b920cc4913b77b1e463afad27ad5b78"/><file name="Viewed.php" hash="c2a9c99a56b57d8288eec75657f9bd47"/></dir><file name="Product.php" hash="33f395e10d5578d948bf32a7bd5388fd"/><file name="Wishlist.php" hash="ee26b4efcbf3b2c39aec2c1e3402c35b"/></dir><file name="Server.php" hash="1f51d81e323af28fd78618e62db11d82"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Icon.php" hash="242de9b094f94e397dc606dc926cc33f"/><file name="Payment.php" hash="5964322419785004a6c3f84a940d8d13"/><file name="Shipping.php" hash="016f22646fbac10cd81c6b7904c9abde"/></dir><dir name="Source"><dir name="Address"><file name="Attributes.php" hash="1a29b64d271693fba3ea76599d3408e2"/><file name="Validatetype.php" hash="6f4d9767ac0e476ec6a6cd3964882721"/></dir><file name="Attributes.php" hash="4b4de29e00623c971038d6fe895e5e76"/><dir name="Bazaarvoice"><file name="Env.php" hash="bc619503d1b175e74f7eaf2ba15ae8b4"/></dir><dir name="Catalog"><file name="Direction.php" hash="68cd86444037506ec39de8eba3c07d8b"/><file name="Sortby.php" hash="d2aba9a3798b8e2eee8c275fbbd202e1"/></dir><file name="Catalogimage.php" hash="500f9994ea13e463a5e5e5d3963cfbd1"/><dir name="Customer"><file name="Attributes.php" hash="8963356aabf88647ab5ecbbbe8cfb9f1"/></dir><file name="Defaultimage.php" hash="04c896116c01b16e2ac8d7f23bbc29d6"/><file name="Payment.php" hash="70e82f4887eb297d6a58160f64bfd204"/><file name="Shipping.php" hash="7d8e5a2dc8a57099d908bef2403aad46"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Japi"><file name="LogController.php" hash="b17e024285aea7b6834cf5bc9b868916"/><file name="OrderController.php" hash="e6b7c1f5a7156a06fa3f51c32e6bbba9"/><file name="ReportController.php" hash="e88b2425e0a39f7f2b0c2902a6d2d5e9"/><file name="TroubleshootingController.php" hash="bb8951d1523a56a0f55e827614a38d66"/></dir></dir><file name="CheckoutController.php" hash="5d368a3c0a26d8a04abcb54634ce8464"/><dir name="Customer"><file name="AccountController.php" hash="2e055c5b22a2414263a1b7d3fd0607f9"/></dir><file name="CustomerController.php" hash="1336f9ccebf73e6e8f69d33503cd2bd7"/><file name="ImageController.php" hash="a5b48d4e075faf989c908bd0954d3878"/><file name="KcoController.php" hash="38e15112f3438edd6723478cf18c6cab"/><file name="KlarnaController.php" hash="fafb22cc7b5e2f69ee3dfb9094a04dcd"/><dir name="Rest"><file name="CartController.php" hash="3994aafe8e31094b765fc0120c888fa3"/><file name="CatalogController.php" hash="8df5b798bb0330f5e3182717e1e15bf7"/><file name="CheckoutController.php" hash="2fd4a4bca1a37788616645f50392a701"/><file name="CmsController.php" hash="cb1bc3f67136434c4d8af1b5660eab1e"/><file name="CustomerController.php" hash="ca2b76f8f4e8a84d81749b37910287bd"/><file name="MageController.php" hash="e267156b2acf82d309b6c8c4680a7371"/><file name="ProductController.php" hash="81c0a0b0afcdfe99d6c651244baa075c"/><file name="WishlistController.php" hash="d7b0c8ff628b4244d120843d54a41248"/></dir><file name="TestController.php" hash="ffb60653808c0e0af00cc73d4755ef99"/></dir><dir name="data"><dir name="japi_setup"><file name="data-install-2.0.0.php" hash="bcf6de66f6b296182268b11b3e80bbeb"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="9d1888abb4ed93ec7b3e1fa678fb1411"/><file name="config.xml" hash="a5a9617e722e346dea525a8e04c4718f"/><file name="system.xml" hash="1b9055645c0c515722b99ada6adfb047"/></dir><dir name="sql"><dir name="japi_setup"><file name="install-1.0.0.php" hash="ce407ff5715c837d02b1aba7975bf512"/><file name="upgrade-2.0.1.2-2.0.2.php" hash="6fc0e0306b685279fc60f298643d181a"/><file name="upgrade-2.1.6-2.2.0.php" hash="947afcf7e20dfc2c3a3e45d8e5c316cd"/><file name="upgrade-2.2.0-2.2.1.php" hash="12a28845acf823eefc5f613b048efe52"/><file name="upgrade-2.8.2-2.9.0.php" hash="2761423f65920af0f8ba05d438710869"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Jmango360_Japi.xml" hash="b60701b3a14084fa1a440ca5fe5bf47b"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="jmango360_japi.xml" hash="d6e1656e4a8e79dd9e37e0b09a5f57a6"/></dir><dir name="template"><dir name="japi"><dir name="report"><file name="chart.phtml" hash="102704d97cf69793a50fa96538bd767f"/><dir name="grid"><file name="container.phtml" hash="79050f4e2bc7b70ae452e850fc27e0b7"/></dir></dir><dir name="widget"><dir name="form"><dir name="renderer"><dir name="element"><file name="chart.phtml" hash="fb14be221a9ec0faad4ace8579c5dddc"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="jmango360_japi.xml" hash="af8409687b5ea1b5057acb5bec40a52b"/></dir><dir name="template"><dir name="japi"><dir name="TIG"><dir name="PostNL"><dir name="av"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="0cb781955d33fae46da09d62bd6fdaf3"/><file name="shipping.phtml" hash="cb72f56f0d26171c429d7a70701e0913"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="9a623e8c2184d08c2b288456ba50aef4"/><file name="postcode_check.phtml" hash="cbb8bfd76db65041cafacf976312ceb7"/></dir></dir></dir><dir name="do"><dir name="onepage"><file name="available.phtml" hash="8fce41a1696540a4546b52c025f3dde7"/></dir></dir></dir></dir><dir name="checkout"><dir name="onepage"><file name="additional_agreements.phtml" hash="6d7571be118af57a5dbe13d06f3ff2b3"/><file name="address.phtml" hash="3164ff4fc2d5f798e591a168d9d937d1"/><file name="agreements.phtml" hash="ae43c3b670b0d11a1217ca927a184ff7"/><file name="billing.phtml" hash="d5491399cbce3e565757023dc3e594ed"/><file name="coupon.phtml" hash="a27beeba5f8b2160dccc6d4198c6517d"/><file name="js.phtml" hash="ac1740fe3e829d228a57b1e1a9dda58b"/><dir name="payment"><file name="info.phtml" hash="26bb640843ee3fb6e72b4f2739f0a111"/><file name="methods.phtml" hash="1680b5e33d8123fdb58ecbd353ff1ba7"/></dir><file name="payment.phtml" hash="cc3bfd21f2a141ea403db094e1264781"/><dir name="review"><file name="button.phtml" hash="e2089ae34e409df2fa13977a55db5f04"/><file name="info.phtml" hash="306936f465adcc1c09ad37b58609085d"/><file name="item.phtml" hash="244bba60d9151be71777e80e138b6ee7"/><dir name="totals"><file name="grand_total.phtml" hash="4ee3bdd1190a459e243249e288e6caff"/><file name="shipping.phtml" hash="75900b7d4cfb370e803d1489148450ad"/><file name="subtotal.phtml" hash="f91e3bc1a39761fa7cea8fc296091430"/><file name="tax.phtml" hash="37173b32341b2692a7890111f02f2938"/></dir><file name="totals.phtml" hash="0decbe242701193fee270e1f0f520a93"/></dir><file name="review.phtml" hash="d2494b8faac5833e747a5d329ee4fab7"/><file name="shipping.phtml" hash="d0aba8dade93f6798285f7163ec65e58"/><dir name="shipping_method"><file name="additional.phtml" hash="78c6dab72fefb888f587221639bf9177"/><file name="available.phtml" hash="4feca53deabec45bc3b223e64e32c4f0"/></dir><file name="shipping_method.phtml" hash="edc75d0aecc103ed69b216ef76bc6af2"/><file name="style.phtml" hash="1a28dcebc9bddba3c6e4e5cb44a2eb80"/></dir><file name="onepage.phtml" hash="733ad23bfa6442a5fcab8c9a6bbf1b88"/></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="900db1b8385f75e448f7ca42c8d113da"/></dir><dir name="form"><file name="additional.phtml" hash="0d413b832a447a524de18c74cbd17844"/><file name="edit.phtml" hash="484b2b56cbf34dba73c78dc97552c024"/><file name="register.phtml" hash="978dc0d67f796c90e8675cbaec1a06ba"/></dir></dir><dir name="fatturazione"><dir name="customer"><dir name="address"><file name="edit.phtml" hash="e7f27a8a61d9554bfbc4f36dfff60e4d"/></dir></dir></dir><file name="form.phtml" hash="eec0416c8830c4ebe004256d86c7ea59"/><dir name="giftmessage"><file name="inline.phtml" hash="78814da47aed68315b7d1d6b2e64c4c7"/></dir><file name="js.phtml" hash="9af5ac67d9b1a4fc689084e135215f99"/><dir name="kega_checkout"><dir name="onepage"><file name="payment.phtml" hash="36ceb7a03629f08c789f42e98b1c1535"/></dir></dir><dir name="nwt"><dir name="kco"><dir name="cart"><dir name="item"><file name="default.phtml" hash="212018e8f0c4472a07fc81633d27c550"/></dir></dir><file name="checkout.phtml" hash="c7781347405e7e59322d9fc3b2f42b3c"/></dir></dir><dir name="page"><dir name="html"><file name="head.phtml" hash="b6a8cc30cd31bf642c2f885ed1fda855"/><file name="smart-app-banner.phtml" hash="8423731f246db33efb61026dd9ef5ddc"/></dir><file name="rwd.phtml" hash="06c53b02ad843574b22a803a709988f6"/></dir><dir name="symfony"><dir name="postcode"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="65181e0ab40a40671f35c54bc25b99af"/><file name="shipping.phtml" hash="a6e2a192b9998889e5d113a92df62623"/></dir></dir></dir></dir><dir name="vaimo"><dir name="klarna"><dir name="klarnacheckout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="f9f469de9cd1243cab176fc56071db64"/></dir></dir><file name="cart.phtml" hash="b40f17348beb248c4f1ff22374a1a05d"/><dir name="customer"><file name="balance.phtml" hash="198809cb8ebf8a468b89497c9abba07c"/></dir><dir name="discount"><file name="coupon.phtml" hash="1f3686b00a610d3f038c84e3621ef913"/></dir><file name="header.phtml" hash="fed93df0c84265a0f980b0de103945b8"/><file name="main.phtml" hash="94ad4f3aa30ae7db1131a1fe48ea2a99"/><file name="newsletter.phtml" hash="3a2251b9559e8b87b46ddf08b7cd27e2"/><file name="reward.phtml" hash="38c218d3777f11b03c3686067a706d00"/><file name="shipping_method.phtml" hash="44bb3c6efaab76641e02a07c2007a090"/><file name="sidebar.phtml" hash="410508fd9089e0be030915836abb42e2"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="japi"><dir name="css"><dir name="TIG"><dir name="Buckaroo3Extended"><file name="styles_opc.css" hash="9b0ecbbeb22655e2e896ec8134fa8188"/></dir></dir><file name="gomage-checkout.css" hash="223657dbb0aba2783bb9e8de4b633d93"/><dir name="icomoon"><dir name="fonts"><file name="icomoon.eot" hash="842065e274d718c38968a81a721d49f4"/><file name="icomoon.svg" hash="2deea3fcd9ecc464a422aa37943b5848"/><file name="icomoon.ttf" hash="8ffbfccd78de7c37eadeca837ee40344"/><file name="icomoon.woff" hash="32df67c3aed8769c316b3e7ff1bb637c"/></dir><file name="style.css" hash="178c956df2a327dc88e4ef8069caa9bc"/></dir><file name="send-cloud.css" hash="77f77fa89359fe508708ec522a5e76d8"/><file name="style.css" hash="f08d0683b5b01d18ed6097be93a6a93a"/><file name="style.less" hash="861bf6e1830d93975acf932ed876b29a"/></dir><dir name="images"><file name="ajax-loader.gif" hash="f48ee069890b16455c3ddcacee9b5f75"/><file name="bg-down.png" hash="04d7cd2963010b610f608aca03a45c63"/><file name="bg-up.png" hash="2882d38108532275fb1d425bbd021c9d"/><file name="glc_sprite.png" hash="5cd6f3ba1df3a6d26db5bbc193ce9c61"/></dir><dir name="js"><file name="checkout.js" hash="9f13a3545ecfe0e2d35f61c1db304c60"/><dir name="vaimo"><dir name="klarna"><file name="klarnautils.js" hash="e29553aa8446af7672c9ba1814fac3a5"/></dir></dir><dir name="varien"><file name="form.js" hash="9abc0bb4419828513b5c6e904a041616"/></dir></dir><dir name="lib"><dir name="bootstrap"><dir name="css"><file name="bootstrap.min.css" hash="5d5357cb3704e1f43a1f5bfed2aebf42"/></dir><dir name="fonts"><file name="glyphicons-halflings-regular.eot" hash="f4769f9bdb7466be65088239c12046d1"/><file name="glyphicons-halflings-regular.svg" hash="89889688147bd7575d6327160d64e760"/><file name="glyphicons-halflings-regular.ttf" hash="e18bbf611f2a2e43afc071aa2f4e1512"/><file name="glyphicons-halflings-regular.woff" hash="fa2772327f55d8198301fdb8bcfc8158"/><file name="glyphicons-halflings-regular.woff2" hash="448c34a56d699c29117adc64c43affeb"/></dir><dir name="js"><file name="collapse.js" hash="2bc99ca6c9b060ba5616f41ddd5e2703"/><file name="modal.js" hash="b7d8f688e67e78c07ffde44ec4248fd9"/><file name="transition.js" hash="3cb001675410903ecaadcfeb7c296965"/></dir></dir><dir name="jquery"><file name="jquery-1.11.2.min.js" hash="5790ead7ad3ba27397aedfa3d263b867"/><file name="jquery-noconflict.js" hash="32eb0a33820167f328a227e11210d32a"/></dir><dir name="ladda"><file name="ladda.min.css" hash="614e769024385cf21879d6a238b682e1"/><file name="ladda.min.js" hash="a34bcf417de7fc290ac5b034caca2371"/></dir><dir name="scrollto"><file name="scrollTo.js" hash="5c86793da8a4bfec6338bec965d35f6b"/></dir><dir name="smart-app-banner"><file name="smart-app-banner.css" hash="64c15053dbd22b44a519f55e75f6c2ca"/><file name="smart-app-banner.js" hash="4162cb20424080964b5d886125b73b47"/></dir><dir name="spin"><file name="spin.min.js" hash="1d06ceb800acbeae82d1fa2ad5b571de"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Jmango360_Japi.csv" hash="3ecbadafe75c076e087389e527c2fa4e"/></dir><dir name="fr_FR"><file name="Jmango360_Japi.csv" hash="18a1f2a8dfca8ba4a2cb98d2e7deb0a1"/></dir><dir name="it_IT"><file name="Jmango360_Japi.csv" hash="2ff891468a5c5fe0bd3775cc155341cb"/></dir><dir name="pt_PT"><file name="Jmango360_Japi.csv" hash="3a70c94cf76ccf0649ab2c525f2acece"/></dir><dir name="pt_BR"><file name="Jmango360_Japi.csv" hash="3a70c94cf76ccf0649ab2c525f2acece"/></dir><dir name="ar_SA"><file name="Jmango360_Japi.csv" hash="25b829fa5515c567af7ed8e5e4a2690a"/></dir><dir name="nl_NL"><file name="Jmango360_Japi.csv" hash="f37b336b47a320803a967237a7765a2a"/></dir><dir name="sv_SE"><file name="Jmango360_Japi.csv" hash="3414d54579206e71cabaaea3153bc266"/></dir><dir name="da_DK"><file name="Jmango360_Japi.csv" hash="a8f243d230a312f4d5cee8c99a275ee7"/></dir><dir name="es_ES"><file name="Jmango360_Japi.csv" hash="0f763b984f64e095f863c2e66335c791"/></dir><dir name="de_DE"><file name="Jmango360_Japi.csv" hash="d97408dc0ece1a193669bc491798355a"/></dir></target></contents>
37
  <compatible/>
38
  <dependencies><required><php><min>5.2.0</min><max>7.1.0</max></php></required></dependencies>
39
  </package>
skin/frontend/base/default/japi/css/style.css CHANGED
@@ -222,9 +222,30 @@ a:hover {
222
  .jm-item .jm-item-detail .jm-item-desc .jm-item-desc-item {
223
  display: block;
224
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
225
  .modal-agreement .modal-title {
226
- font-size: 30px;
227
  line-height: 1;
 
 
228
  }
229
  .modal-agreement .modal-dialog {
230
  margin: 0;
@@ -238,6 +259,7 @@ a:hover {
238
  font-size: 2em;
239
  font-weight: normal;
240
  min-width: 1em;
 
241
  }
242
  #checkout-review-table tfoot {
243
  border-top: solid 1px #D4D2D2;
@@ -313,6 +335,7 @@ p.back-link {
313
  font-weight: normal;
314
  vertical-align: middle;
315
  padding: 0;
 
316
  }
317
  .form-list label.required em {
318
  color: #DF280A;
222
  .jm-item .jm-item-detail .jm-item-desc .jm-item-desc-item {
223
  display: block;
224
  }
225
+ .modal-open .modal {
226
+ overflow: hidden;
227
+ }
228
+ .modal-agreement {
229
+ top: 1em;
230
+ right: 1em;
231
+ bottom: 1em;
232
+ left: 1em;
233
+ }
234
+ .modal-agreement .modal-dialog,
235
+ .modal-agreement .modal-content {
236
+ height: 100%;
237
+ }
238
+ .modal-agreement .modal-dialog .modal-body,
239
+ .modal-agreement .modal-content .modal-body {
240
+ overflow: auto;
241
+ height: 100%;
242
+ padding-bottom: 70px;
243
+ }
244
  .modal-agreement .modal-title {
245
+ font-size: 1.5em;
246
  line-height: 1;
247
+ white-space: nowrap;
248
+ overflow: hidden;
249
  }
250
  .modal-agreement .modal-dialog {
251
  margin: 0;
259
  font-size: 2em;
260
  font-weight: normal;
261
  min-width: 1em;
262
+ opacity: 1;
263
  }
264
  #checkout-review-table tfoot {
265
  border-top: solid 1px #D4D2D2;
335
  font-weight: normal;
336
  vertical-align: middle;
337
  padding: 0;
338
+ margin: 0;
339
  }
340
  .form-list label.required em {
341
  color: #DF280A;
skin/frontend/base/default/japi/css/style.less CHANGED
@@ -265,10 +265,33 @@ a, a:focus, a:hover {
265
  }
266
  }
267
 
 
 
 
 
 
 
268
  .modal-agreement {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
269
  .modal-title {
270
- font-size: 30px;
271
  line-height: 1;
 
 
272
  }
273
 
274
  .modal-dialog {
@@ -284,6 +307,7 @@ a, a:focus, a:hover {
284
  font-size: 2em;
285
  font-weight: normal;
286
  min-width: 1em;
 
287
  }
288
  }
289
  }
@@ -377,6 +401,7 @@ p.required, p.back-link {
377
  font-weight: normal;
378
  vertical-align: middle;
379
  padding: 0;
 
380
  }
381
 
382
  .fields {
265
  }
266
  }
267
 
268
+ .modal-open {
269
+ .modal {
270
+ overflow: hidden;
271
+ }
272
+ }
273
+
274
  .modal-agreement {
275
+ top: 1em;
276
+ right: 1em;
277
+ bottom: 1em;
278
+ left: 1em;
279
+
280
+ .modal-dialog, .modal-content {
281
+ height: 100%;
282
+
283
+ .modal-body {
284
+ overflow: auto;
285
+ height: 100%;
286
+ padding-bottom: 70px;
287
+ }
288
+ }
289
+
290
  .modal-title {
291
+ font-size: 1.5em;
292
  line-height: 1;
293
+ white-space: nowrap;
294
+ overflow: hidden;
295
  }
296
 
297
  .modal-dialog {
307
  font-size: 2em;
308
  font-weight: normal;
309
  min-width: 1em;
310
+ opacity: 1;
311
  }
312
  }
313
  }
401
  font-weight: normal;
402
  vertical-align: middle;
403
  padding: 0;
404
+ margin: 0;
405
  }
406
 
407
  .fields {
skin/frontend/base/default/japi/js/checkout.js CHANGED
@@ -518,6 +518,11 @@ if (typeof Review !== 'undefined') {
518
  if (this.agreementsForm) {
519
  params += '&' + Form.serialize(this.agreementsForm);
520
  }
 
 
 
 
 
521
  params += '&redirect=' + checkout.redirectUrl;
522
  new Ajax.Request(this.saveUrl, {
523
  method: 'post',
@@ -547,4 +552,9 @@ if (typeof Review !== 'undefined') {
547
  }.bind(this));
548
  return validateResult;
549
  };
 
 
 
 
 
550
  }
518
  if (this.agreementsForm) {
519
  params += '&' + Form.serialize(this.agreementsForm);
520
  }
521
+ if (this.moreForms) {
522
+ for (var i = 0; i < this.moreForms.length; i++) {
523
+ params += '&' + Form.serialize(this.moreForms[i]);
524
+ }
525
+ }
526
  params += '&redirect=' + checkout.redirectUrl;
527
  new Ajax.Request(this.saveUrl, {
528
  method: 'post',
552
  }.bind(this));
553
  return validateResult;
554
  };
555
+
556
+ Review.prototype.addMoreFormToSubmit = function (formId) {
557
+ if (!this.moreForms) this.moreForms = [];
558
+ this.moreForms.push($(formId));
559
+ };
560
  }