Mashon_Sync - Version 1.4.1

Version Notes

developed on magento 1.5.1.0;

-customized cart page to show the Dabble product thumbnail
-fixed Mage logException() error

Download this release

Release Info

Developer brandonWargo
Extension Mashon_Sync
Version 1.4.1
Comparing to
See all releases


Code changes from version 1.4.0 to 1.4.1

Files changed (3) hide show
  1. app/code/community/Mashon/Sync/Helper/Data.php +5 -5
  2. app/design/frontend/default/default/template/checkout/cart/item/default.phtml +263 -0
  3. package.xml +6 -8
app/code/community/Mashon/Sync/Helper/Data.php CHANGED
@@ -51,7 +51,7 @@ class Mashon_Sync_Helper_Data extends Mage_Core_Helper_Abstract
51
  return array("_id" => $dabbleId,"success" => false,"message" => "Dabble product data could not be found. Please check your dabble url in magento module","shopProductId" => "");
52
  }
53
  } catch (Exception $e) {
54
- Mage::logException($e->getMessage());
55
  return array("_id" => $dabbleId,"success" => false,"message" => "An error occurred while syncing, please check server logs.","shopProductId" => "");
56
  }
57
  return array("_id" => $dabbleId,"success" => false,"message" => "Product was not created in your store. Please check magento logs.","shopProductId" => "");
@@ -91,7 +91,7 @@ class Mashon_Sync_Helper_Data extends Mage_Core_Helper_Abstract
91
  }
92
  }
93
  catch (Exception $e) {
94
- Mage::logException($e->getMessage());
95
  return array("_id" => $dabbleId,"success" => false,"message" => "An error occurred while syncing, please check server logs.","shopProductId" => $magentoid);
96
  }
97
  return array("_id" => $dabbleId,"success" => false,"message" => "Product was not updated in your store. Please check Magento logs.","shopProductId" => $magentoid);
@@ -155,7 +155,7 @@ class Mashon_Sync_Helper_Data extends Mage_Core_Helper_Abstract
155
  </block>
156
  <block type="core/text" name="mystuff.js">
157
  <action method="setText">
158
- <text><![CDATA[<script type="text/javascript" src="http://dabbleapp.com/loaders/instantiation.js?width=500&height=593&designedId='.$data->{'_id'}.'&new=true&productChangeCallback=changeTheProduct&frameborder=1"></script>]]></text>
159
  </action>
160
  </block>
161
  </reference>
@@ -216,7 +216,7 @@ class Mashon_Sync_Helper_Data extends Mage_Core_Helper_Abstract
216
  return true;
217
  }
218
  catch (Exception $e) {
219
- Mage::logException($e->getMessage());
220
  return null;
221
  }
222
  }
@@ -445,7 +445,7 @@ class Mashon_Sync_Helper_Data extends Mage_Core_Helper_Abstract
445
  </block>
446
  <block type="core/text" name="mystuff.js">
447
  <action method="setText">
448
- <text><![CDATA[<script type="text/javascript" src="http://dabbleapp:8080/loaders/instantiation.js?width=500&height=593&designedId='.$data->{'_id'}.'&new=true&productChangeCallback=changeTheProduct&frameborder=1"></script>]]></text>
449
  </action>
450
  </block>
451
  </reference>
51
  return array("_id" => $dabbleId,"success" => false,"message" => "Dabble product data could not be found. Please check your dabble url in magento module","shopProductId" => "");
52
  }
53
  } catch (Exception $e) {
54
+ Mage::logException($e);
55
  return array("_id" => $dabbleId,"success" => false,"message" => "An error occurred while syncing, please check server logs.","shopProductId" => "");
56
  }
57
  return array("_id" => $dabbleId,"success" => false,"message" => "Product was not created in your store. Please check magento logs.","shopProductId" => "");
91
  }
92
  }
93
  catch (Exception $e) {
94
+ Mage::logException($e);
95
  return array("_id" => $dabbleId,"success" => false,"message" => "An error occurred while syncing, please check server logs.","shopProductId" => $magentoid);
96
  }
97
  return array("_id" => $dabbleId,"success" => false,"message" => "Product was not updated in your store. Please check Magento logs.","shopProductId" => $magentoid);
155
  </block>
156
  <block type="core/text" name="mystuff.js">
157
  <action method="setText">
158
+ <text><![CDATA[<script type="text/javascript" src="http://www.dabbleapp.com/loaders/instantiation.js?width=500&height=593&designedId='.$data->{'_id'}.'&new=true&productChangeCallback=changeTheProduct&frameborder=1"></script>]]></text>
159
  </action>
160
  </block>
161
  </reference>
216
  return true;
217
  }
218
  catch (Exception $e) {
219
+ Mage::logException($e);
220
  return null;
221
  }
222
  }
445
  </block>
446
  <block type="core/text" name="mystuff.js">
447
  <action method="setText">
448
+ <text><![CDATA[<script type="text/javascript" src="http://www.dabbleapp.com/loaders/instantiation.js?width=500&height=593&designedId='.$data->{'_id'}.'&new=true&productChangeCallback=changeTheProduct&frameborder=1"></script>]]></text>
449
  </action>
450
  </block>
451
  </reference>
app/design/frontend/default/default/template/checkout/cart/item/default.phtml ADDED
@@ -0,0 +1,263 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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@magentocommerce.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.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <?php
28
+ $_item = $this->getItem();
29
+ $isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
30
+ $dabbleThumbnail = ''; //thumbnail url sent from Dabble
31
+ if ($_options = $this->getOptionList()):
32
+ foreach ($_options as $_option):
33
+ $_formatedOptionValue = $this->getFormatedOptionValue($_option);
34
+ if (strtolower($this->htmlEscape($_option['label'])) == 'thumbnail'):
35
+ $dabbleThumbnail = ($_option['value']);
36
+ endif;
37
+ endforeach;
38
+ endif;
39
+
40
+ ?>
41
+ <tr>
42
+ <td><?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->htmlEscape($this->getProductName()) ?>"><?php endif;?><img src="<?php if (strlen($dabbleThumbnail) > 0): ?><?php echo $dabbleThumbnail ?><?php else: ?><?php echo $this->htmlEscape($this->getProductThumbnail()) ?><?php endif; ?>" width="75" height="75" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" /><?php if ($this->hasProductUrl()):?></a><?php endif;?></td><td>
43
+ <h2 class="product-name">
44
+ <?php if ($this->hasProductUrl()):?>
45
+ <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->htmlEscape($this->getProductName()) ?></a>
46
+ <?php else: ?>
47
+ <?php echo $this->htmlEscape($this->getProductName()) ?>
48
+ <?php endif; ?>
49
+ </h2>
50
+ <?php if ($_options = $this->getOptionList()):?>
51
+ <dl class="item-options">
52
+ <?php foreach ($_options as $_option) : ?>
53
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
54
+ <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
55
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
56
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
57
+ <div class="truncated_full_value">
58
+ <dl class="item-options">
59
+ <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
60
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
61
+ </dl>
62
+ </div>
63
+ <?php endif; ?>
64
+ </dd>
65
+ <?php endforeach; ?>
66
+ </dl>
67
+ <?php endif;?>
68
+ <?php if ($messages = $this->getMessages()): ?>
69
+ <?php foreach ($messages as $message): ?>
70
+ <p class="item-msg <?php echo $message['type'] ?>">* <?php echo $message['text'] ?></p>
71
+ <?php endforeach; ?>
72
+ <?php endif; ?>
73
+ <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
74
+ <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
75
+ <?php endif;?>
76
+ </td>
77
+ <td class="a-center">
78
+ <?php if ($isVisibleProduct): ?>
79
+ <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
80
+ <?php endif ?>
81
+ </td>
82
+ <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
83
+ <td class="a-center">
84
+ <?php if ($isVisibleProduct): ?>
85
+ <input type="checkbox" value="1" name="cart[<?php echo $_item->getId() ?>][wishlist]" title="<?php echo $this->__('Move to Wishlist') ?>" class="checkbox" />
86
+ <?php endif ?>
87
+ </td>
88
+ <?php endif ?>
89
+ <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
90
+ <td class="a-right">
91
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
92
+ <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
93
+ <?php else: ?>
94
+ <span class="cart-price">
95
+ <?php endif; ?>
96
+
97
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
98
+ <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
99
+ <?php else: ?>
100
+ <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?>
101
+ <?php endif; ?>
102
+
103
+ </span>
104
+
105
+
106
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
107
+
108
+ <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
109
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
110
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
112
+ <?php endforeach; ?>
113
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
114
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
115
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
116
+ <?php endforeach; ?>
117
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
118
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
119
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
120
+ <?php endforeach; ?>
121
+ <?php endif; ?>
122
+ </div>
123
+
124
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
125
+ <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
126
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total'); ?>: <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
127
+ </div>
128
+ <?php endif; ?>
129
+ <?php endif; ?>
130
+ </td>
131
+ <?php endif; ?>
132
+ <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
133
+ <td>
134
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
135
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
136
+ <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
137
+ <?php else: ?>
138
+ <span class="cart-price">
139
+ <?php endif; ?>
140
+
141
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
142
+ <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
143
+ <?php else: ?>
144
+ <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
145
+ <?php endif; ?>
146
+
147
+ </span>
148
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
149
+
150
+ <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
151
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
152
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
153
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
154
+ <?php endforeach; ?>
155
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
156
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
157
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
158
+ <?php endforeach; ?>
159
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
160
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
161
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
162
+ <?php endforeach; ?>
163
+ <?php endif; ?>
164
+ </div>
165
+
166
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
167
+ <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
168
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
169
+ </div>
170
+ <?php endif; ?>
171
+ <?php endif; ?>
172
+ </td>
173
+ <?php endif; ?>
174
+ <td class="a-center">
175
+ <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
176
+ </td>
177
+ <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
178
+ <td class="a-right">
179
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
180
+ <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
181
+ <?php else: ?>
182
+ <span class="cart-price">
183
+ <?php endif; ?>
184
+
185
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
186
+ <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
187
+ <?php else: ?>
188
+ <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?>
189
+ <?php endif; ?>
190
+
191
+ </span>
192
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
193
+
194
+ <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
195
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
196
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
197
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
198
+ <?php endforeach; ?>
199
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
200
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
201
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
202
+ <?php endforeach; ?>
203
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
204
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
205
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
206
+ <?php endforeach; ?>
207
+ <?php endif; ?>
208
+ </div>
209
+
210
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
211
+ <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
212
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total'); ?>: <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
213
+ </div>
214
+ <?php endif; ?>
215
+ <?php endif; ?>
216
+ </td>
217
+ <?php endif; ?>
218
+ <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
219
+ <td>
220
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
221
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
222
+ <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
223
+ <?php else: ?>
224
+ <span class="cart-price">
225
+ <?php endif; ?>
226
+
227
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
228
+ <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
229
+ <?php else: ?>
230
+ <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
231
+ <?php endif; ?>
232
+
233
+ </span>
234
+
235
+
236
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
237
+
238
+ <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
239
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
240
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
241
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
242
+ <?php endforeach; ?>
243
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
244
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
245
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
246
+ <?php endforeach; ?>
247
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
248
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
249
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
250
+ <?php endforeach; ?>
251
+ <?php endif; ?>
252
+ </div>
253
+
254
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
255
+ <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
256
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
257
+ </div>
258
+ <?php endif; ?>
259
+ <?php endif; ?>
260
+ </td>
261
+ <?php endif; ?>
262
+ <td class="a-center"><a href="<?php echo $this->getDeleteUrl()?>" title="<?php echo $this->__('Remove item')?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove item')?></a></td>
263
+ </tr>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mashon_Sync</name>
4
- <version>1.4.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -10,14 +10,12 @@
10
  <description>Mashon_Sync allows the Magento shop owner to easily integrate Dabble into their Magento version 1.5.1.0 shop. This extension allows you to sync your Dabble Templates and Designed Products into Magento.</description>
11
  <notes>developed on magento 1.5.1.0;&#xD;
12
  &#xD;
13
- -Added new Editable attribute which allows Designed products to be edited further in Dabble&#xD;
14
- - added Custom Layout XML for Editable and Configured products&#xD;
15
- - product detail page for Synced Dabble products is now dynamically built using Custom Layout XML and individual dabble prefixed phtml files instead of all logic in the product/view.phtml&#xD;
16
- </notes>
17
  <authors><author><name>brandonWargo</name><user>brandonWargo</user><email>brandon.wargo@mashon.com</email></author></authors>
18
- <date>2012-05-18</date>
19
- <time>17:20:44</time>
20
- <contents><target name="magecommunity"><dir name="Mashon"><dir name="Sync"><dir name="Block"><file name="Sync.php" hash="d880873f5863ac7d2e627edad0289266"/></dir><dir name="Helper"><file name="Data.php" hash="8dbf8d3cf0726f51f0cf09e7fd0f41b1"/></dir><dir name="controllers"><file name="CartController.php" hash="56a3e95f9fe636a1c77567effa2dae0f"/><file name="OrderController.php" hash="5a834a5d4980b05f8684e7d10739e20a"/><file name="ProductController.php" hash="1558404804f2174b04d7163059522bf0"/></dir><dir name="etc"><file name="config.xml" hash="04f32bf3558fbd20d508df4fd06b2b21"/></dir><dir name="sql"><dir name="mashon_setup"><file name="mysql4-install-1.0.php" hash="8ffe4d77aa3131392caa80e891afe3f9"/><file name="mysql4-upgrade-1.0-1.1.php" hash="46e3030b6acf2a66aaa843924a8af710"/><file name="mysql4-upgrade-1.3.4-1.4.php" hash="bb8f8b6247d5fdd4ccc4b43334a2dca5"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mashon_All.xml" hash="2929381275448f2ea1409a08703b6349"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="dabble"><dir name="template"><dir name="catalog"><dir name="product"><dir name="view"><file name="createyourown.phtml" hash="0e79cd3ec104ca8dde52f2b60122d0c2"/></dir><file name="view.phtml" hash="1883d9ac26da40bfbba351448d0997cc"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="7cb8b98411059ecd0651cc116fa973e3"/></dir></dir></dir></dir></dir><dir name="default"><dir name="template"><dir name="catalog"><dir name="product"><dir name="view"><file name="dabble-media.phtml" hash="03ff38ec5e72fd0f781020a993606053"/><file name="dabble-options.phtml" hash="c3565ab4bf3827231862617b1eab3c2b"/><dir name="options"><file name="dabble-wrapper.phtml" hash="2394c7f5b059b76848607535e5cb2925"/><dir name="wrapper"><file name="createyourown.phtml" hash="0e79cd3ec104ca8dde52f2b60122d0c2"/><file name="dabble-bottom.phtml" hash="2fca682fc852b7293b6e640ff3e523b5"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><file name="dabble-styles.css" hash="f99b83b8fc9c194f64ae528b530e02ec"/></dir></dir></dir></dir></target></contents>
21
  <compatible/>
22
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
23
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mashon_Sync</name>
4
+ <version>1.4.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
10
  <description>Mashon_Sync allows the Magento shop owner to easily integrate Dabble into their Magento version 1.5.1.0 shop. This extension allows you to sync your Dabble Templates and Designed Products into Magento.</description>
11
  <notes>developed on magento 1.5.1.0;&#xD;
12
  &#xD;
13
+ -customized cart page to show the Dabble product thumbnail&#xD;
14
+ -fixed Mage logException() error</notes>
 
 
15
  <authors><author><name>brandonWargo</name><user>brandonWargo</user><email>brandon.wargo@mashon.com</email></author></authors>
16
+ <date>2012-06-15</date>
17
+ <time>00:47:18</time>
18
+ <contents><target name="magecommunity"><dir name="Mashon"><dir name="Sync"><dir name="Block"><file name="Sync.php" hash="d880873f5863ac7d2e627edad0289266"/></dir><dir name="Helper"><file name="Data.php" hash="33a96e626344668ec6f29feb16c3a599"/></dir><dir name="controllers"><file name="CartController.php" hash="56a3e95f9fe636a1c77567effa2dae0f"/><file name="OrderController.php" hash="5a834a5d4980b05f8684e7d10739e20a"/><file name="ProductController.php" hash="1558404804f2174b04d7163059522bf0"/></dir><dir name="etc"><file name="config.xml" hash="04f32bf3558fbd20d508df4fd06b2b21"/></dir><dir name="sql"><dir name="mashon_setup"><file name="mysql4-install-1.0.php" hash="8ffe4d77aa3131392caa80e891afe3f9"/><file name="mysql4-upgrade-1.0-1.1.php" hash="46e3030b6acf2a66aaa843924a8af710"/><file name="mysql4-upgrade-1.3.4-1.4.php" hash="bb8f8b6247d5fdd4ccc4b43334a2dca5"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mashon_All.xml" hash="2929381275448f2ea1409a08703b6349"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="dabble"><dir name="template"><dir name="catalog"><dir name="product"><dir name="view"><file name="createyourown.phtml" hash="0e79cd3ec104ca8dde52f2b60122d0c2"/></dir><file name="view.phtml" hash="1883d9ac26da40bfbba351448d0997cc"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="7cb8b98411059ecd0651cc116fa973e3"/></dir></dir></dir></dir></dir><dir name="default"><dir name="template"><dir name="catalog"><dir name="product"><dir name="view"><file name="dabble-media.phtml" hash="03ff38ec5e72fd0f781020a993606053"/><file name="dabble-options.phtml" hash="c3565ab4bf3827231862617b1eab3c2b"/><dir name="options"><file name="dabble-wrapper.phtml" hash="2394c7f5b059b76848607535e5cb2925"/><dir name="wrapper"><file name="createyourown.phtml" hash="0e79cd3ec104ca8dde52f2b60122d0c2"/><file name="dabble-bottom.phtml" hash="2fca682fc852b7293b6e640ff3e523b5"/></dir></dir></dir></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="c315fb734b15f219a11cb5a1814fea88"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><file name="dabble-styles.css" hash="f99b83b8fc9c194f64ae528b530e02ec"/></dir></dir></dir></dir></target></contents>
19
  <compatible/>
20
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
21
  </package>