Profileolabs_Shoppingflux - Version 1.0.0

Version Notes

- Minor bugfixes & improvements

Download this release

Release Info

Developer ShoppingFlux
Extension Profileolabs_Shoppingflux
Version 1.0.0
Comparing to
See all releases


Code changes from version 0.9.9 to 1.0.0

Files changed (20) hide show
  1. app/code/community/Profileolabs/Shoppingflux/.DS_Store +0 -0
  2. app/code/community/Profileolabs/Shoppingflux/Block/Export/.DS_Store +0 -0
  3. app/code/community/Profileolabs/Shoppingflux/Block/Export/Adminhtml/Catalog/Category/Tab/Default.php +1 -1
  4. app/code/community/Profileolabs/Shoppingflux/Model/.DS_Store +0 -0
  5. app/code/community/Profileolabs/Shoppingflux/Model/Export/Flux.php +4 -1
  6. app/code/community/Profileolabs/Shoppingflux/Model/Manageorders/Observer.php +1 -1
  7. app/code/community/Profileolabs/Shoppingflux/Model/Manageorders/OrderOLD.php +0 -683
  8. app/code/community/Profileolabs/Shoppingflux/controllers/{Export/Adminhtml → Adminhtml/Shoppingfeed/Export}/CategoryController.php +1 -1
  9. app/code/community/Profileolabs/Shoppingflux/controllers/{Export/Adminhtml → Adminhtml/Shoppingfeed}/ExportController.php +1 -1
  10. app/code/community/Profileolabs/Shoppingflux/controllers/Adminhtml/{GeneralController.php → Shoppingfeed/GeneralController.php} +1 -1
  11. app/code/community/Profileolabs/Shoppingflux/controllers/{Manageorders/Adminhtml → Adminhtml/Shoppingfeed/Order}/CronController.php +1 -1
  12. app/code/community/Profileolabs/Shoppingflux/controllers/{Manageorders/Adminhtml → Adminhtml/Shoppingfeed/Order}/ImportController.php +1 -1
  13. app/code/community/Profileolabs/Shoppingflux/controllers/{Manageorders/Adminhtml → Adminhtml/Shoppingfeed/Order}/LogController.php +1 -1
  14. app/code/community/Profileolabs/Shoppingflux/controllers/{Manageorders/Adminhtml → Adminhtml/Shoppingfeed}/OrderController.php +1 -1
  15. app/code/community/Profileolabs/Shoppingflux/etc/adminhtml.xml +7 -7
  16. app/code/community/Profileolabs/Shoppingflux/etc/config.xml +2 -2
  17. app/code/community/Profileolabs/Shoppingflux/sql/profileolabs_shoppingflux_setup/.DS_Store +0 -0
  18. app/design/adminhtml/default/default/layout/profileolabs_shoppingflux.xml +14 -14
  19. app/design/adminhtml/default/default/template/profileolabs/shoppingflux/export/edit.phtml +1 -1
  20. package.xml +4 -4
app/code/community/Profileolabs/Shoppingflux/.DS_Store DELETED
Binary file
app/code/community/Profileolabs/Shoppingflux/Block/Export/.DS_Store DELETED
Binary file
app/code/community/Profileolabs/Shoppingflux/Block/Export/Adminhtml/Catalog/Category/Tab/Default.php CHANGED
@@ -182,7 +182,7 @@ class Profileolabs_Shoppingflux_Block_Export_Adminhtml_Catalog_Category_Tab_Defa
182
  }
183
 
184
  public function getGridUrl() {
185
- return $this->getUrl('shoppingflux/export_adminhtml_category/grid', array('_current' => true));
186
  }
187
 
188
  public function getColumnRenderers() {
182
  }
183
 
184
  public function getGridUrl() {
185
+ return $this->getUrl('adminhtml/shoppingfeed_export_category/grid', array('_current' => true));
186
  }
187
 
188
  public function getColumnRenderers() {
app/code/community/Profileolabs/Shoppingflux/Model/.DS_Store DELETED
Binary file
app/code/community/Profileolabs/Shoppingflux/Model/Export/Flux.php CHANGED
@@ -286,8 +286,11 @@ class Profileolabs_Shoppingflux_Model_Export_Flux extends Mage_Core_Model_Abstra
286
  }
287
 
288
 
289
- if ($nameNode == 'ecotaxe' && $attribute->getFrontendInput() == 'weee') {
290
  $weeeAttributes = Mage::getSingleton('weee/tax')->getProductWeeeAttributes($product);
 
 
 
291
 
292
  foreach ($weeeAttributes as $wa) {
293
  if ($wa->getCode() == $attributeCode) {
286
  }
287
 
288
 
289
+ if ($attribute->getFrontendInput() == 'weee') {
290
  $weeeAttributes = Mage::getSingleton('weee/tax')->getProductWeeeAttributes($product);
291
+ if(isset($data[0]['value'])) {//in case weeeAttributes is empty
292
+ $data = $data[0]['value'];
293
+ }
294
 
295
  foreach ($weeeAttributes as $wa) {
296
  if ($wa->getCode() == $attributeCode) {
app/code/community/Profileolabs/Shoppingflux/Model/Manageorders/Observer.php CHANGED
@@ -218,7 +218,7 @@ class Profileolabs_Shoppingflux_Model_Manageorders_Observer {
218
  if (method_exists($block, 'addButton') && $block->getOrderId() && $block->getOrder() && $block->getOrder()->getShoppingfluxShipmentFlag() == 0 && $block->getOrder()->getFromShoppingflux() == 1 && $block->getOrder()->hasShipments()) {
219
  $block->addButton('shoppingflux_shipment', array(
220
  'label' => $this->getHelper()->__('Send notification to ShoppingFeed'),
221
- 'onclick' => "setLocation('" . Mage::helper('adminhtml')->getUrl('shoppingflux/manageorders_adminhtml_import/sendShipment', array('order_id'=>$block->getOrder()->getId())) . "')",
222
  'class' => 'shoppingflux-shipment-notification',
223
  ), 0);
224
  }
218
  if (method_exists($block, 'addButton') && $block->getOrderId() && $block->getOrder() && $block->getOrder()->getShoppingfluxShipmentFlag() == 0 && $block->getOrder()->getFromShoppingflux() == 1 && $block->getOrder()->hasShipments()) {
219
  $block->addButton('shoppingflux_shipment', array(
220
  'label' => $this->getHelper()->__('Send notification to ShoppingFeed'),
221
+ 'onclick' => "setLocation('" . Mage::helper('adminhtml')->getUrl('adminhtml/shoppingfeed_order_import/sendShipment', array('order_id'=>$block->getOrder()->getId())) . "')",
222
  'class' => 'shoppingflux-shipment-notification',
223
  ), 0);
224
  }
app/code/community/Profileolabs/Shoppingflux/Model/Manageorders/OrderOLD.php DELETED
@@ -1,683 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Orders getted here
5
- *
6
- * @category ShoppingFlux
7
- * @package Profileolabs_Shoppingflux
8
- * @author kassim belghait, vincent enjalbert @ web-cooking
9
- *
10
- */
11
- class Profileolabs_Shoppingflux_Model_Manageorders_Order extends Varien_Object {
12
-
13
- /**
14
- * @var Mage_Sales_Model_Quote
15
- */
16
- protected $_quote = null;
17
-
18
- /**
19
- * @var Mage_Customer_Model_Customer
20
- */
21
- protected $_customer = null;
22
-
23
- /**
24
- * Config Data of Module Manageorders
25
- * @var Profileolabs_Shoppingflux_Model_Manageorders_Config
26
- */
27
- protected $_config = null;
28
- protected $_paymentMethod = 'shoppingflux_purchaseorder';
29
- protected $_shippingMethod = 'shoppingflux_shoppingflux';
30
- protected $_nb_orders_imported = 0;
31
- protected $_nb_orders_read = 0;
32
- protected $_ordersIdsImported = array();
33
- protected $_orderIdsAlreadyImported = null;
34
- protected $_result;
35
- protected $_resultSendOrder = "";
36
- protected $_isUnderVersion14 = null;
37
-
38
- /**
39
- * Product model
40
- *
41
- * @var Mage_Catalog_Model_Product
42
- */
43
- protected $_productModel;
44
-
45
- public function getResultSendOrder() {
46
- return $this->_resultSendOrder;
47
- }
48
-
49
- public function isUnderVersion14() {
50
- if (is_null($this->_isUnderVersion14)) {
51
- $this->_isUnderVersion14 = $this->getHelper()->isUnderVersion14();
52
- }
53
- return $this->_isUnderVersion14;
54
- }
55
-
56
- /**
57
- * Retrieve product model cache
58
- *
59
- * @return Mage_Catalog_Model_Product
60
- */
61
- public function getProductModel() {
62
- if (is_null($this->_productModel)) {
63
- $productModel = Mage::getModel('profileolabs_shoppingflux/manageorders_product');
64
- $this->_productModel = Mage::objects()->save($productModel);
65
- }
66
- return Mage::objects()->load($this->_productModel);
67
- }
68
-
69
- public function getOrderIdsAlreadyImported() {
70
- if (is_null($this->_orderIdsAlreadyImported)) {
71
- $orders = Mage::getModel('sales/order')->getCollection()
72
- ->addAttributeToFilter('from_shoppingflux', 1)
73
- ->addAttributeToSelect('order_id_shoppingflux');
74
-
75
- $this->_orderIdsAlreadyImported = array();
76
- foreach ($orders as $order) {
77
- $this->_orderIdsAlreadyImported[] = $order->getOrderIdShoppingflux();
78
- }
79
- }
80
-
81
- return $this->_orderIdsAlreadyImported;
82
- }
83
-
84
- public function isAlreadyImported($idShoppingflux) {
85
- $alreadyImported = $this->getOrderIdsAlreadyImported();
86
- if (in_array($idShoppingflux, $alreadyImported))
87
- return true;
88
-
89
- return false;
90
- }
91
-
92
- public function getSession() {
93
- return Mage::getSingleton('checkout/session');
94
- }
95
-
96
- protected function _getQuote($storeId=null) {
97
- return $this->getSession()->getQuote();
98
- }
99
-
100
- /**
101
- * Retrieve config
102
- * @return Profileolabs_Shoppingflux_Model_Manageorders_Config
103
- */
104
- public function getConfig() {
105
- if (is_null($this->_config)) {
106
- $this->_config = Mage::getSingleton('profileolabs_shoppingflux/config');
107
- }
108
-
109
- return $this->_config;
110
- }
111
-
112
- /**
113
- * Get orders and create it
114
- */
115
- public function manageOrders() {
116
- $stores = Mage::app()->getStores();
117
-
118
- if (Mage::app()->getStore()->getCode() != 'admin')
119
- Mage::app()->setCurrentStore('admin');
120
-
121
- $apiKeyManaged = array();
122
-
123
- //old module version compliance. The goal is to use default store, as in previous versions, if api key is set in global scope.
124
- $defaultStoreId = Mage::app()->getDefaultStoreView()->getId();
125
- if(key($stores) != $defaultStoreId) {
126
- $tmpStores = array($defaultStoreId=>$stores[$defaultStoreId]);
127
- foreach($stores as $store) {
128
- if($store->getId() != $defaultStoreId) {
129
- $tmpStores[$store->getId()] = $store;
130
- }
131
- }
132
- $stores = $tmpStores;
133
- }
134
- //old module version compliance end
135
-
136
-
137
- foreach ($stores as $_store) {
138
- $storeId = $_store->getId();
139
- if ($this->getConfig()->isOrdersEnabled($storeId)) {
140
- $apiKey = $this->getConfig()->getApiKey($storeId);
141
-
142
- if(!$apiKey || in_array($apiKey, $apiKeyManaged))
143
- continue;
144
- $apiKeyManaged[] = $apiKey;
145
-
146
- $wsUri = $this->getConfig()->getWsUri();
147
-
148
- //$isUnderVersion14 = $this->getHelper()->isUnderVersion14();
149
-
150
- /* @var $service Profileolabs_Shoppingflux_Model_Service */
151
- $service = new Profileolabs_Shoppingflux_Model_Service($apiKey, $wsUri);
152
- ini_set("memory_limit", "512M");
153
- try {
154
-
155
- /* @var $this->_result Varien_Simplexml_Element */
156
- $this->_result = $service->getOrders();
157
-
158
- $this->_nb_orders_imported = 0;
159
- } catch (Exception $e) {
160
- Mage::logException($e);
161
- $message = Mage::helper('profileolabs_shoppingflux')->__('Orders can not getted.'); //." ".Mage::helper('profileolabs_shoppingflux')->__('Error').": ".$e->getMessage();
162
- $this->getHelper()->log($message);
163
- //Mage::throwException($message);
164
-
165
- Mage::throwException($e);
166
- }
167
-
168
- //We parse result
169
- //$nodes = current($this->_result->children());
170
- $nodes = $this->_result->children();
171
- foreach ($nodes as $childName => $child) {
172
-
173
- $orderSf = $this->getHelper()->asArray($child);
174
-
175
-
176
- if ($this->isAlreadyImported($orderSf['IdOrder']))
177
- continue;
178
-
179
-
180
- $this->_nb_orders_read++;
181
-
182
- $this->createAllForOrder($orderSf, $storeId);
183
-
184
- if ($this->_nb_orders_imported == $this->getConfig()->getLimitOrders($storeId))
185
- break;
186
- }
187
-
188
- try {
189
- if ($this->_nb_orders_imported > 0) {
190
-
191
- $result = $service->sendValidOrders($this->_ordersIdsImported);
192
-
193
-
194
- if ($result) {
195
- if ($result->error) {
196
- Mage::throwException($result->error);
197
- }
198
-
199
- $this->_resultSendOrder = $result->status;
200
- } else {
201
- $this->getHelper()->log("Error in order ids validated");
202
- Mage::throwException("Error in order ids validated");
203
- }
204
- }
205
- } catch (Exception $e) {
206
- $this->getHelper()->log($e->getMessage());
207
- Mage::throwException($e);
208
- }
209
- }
210
- }
211
- return $this;
212
- }
213
-
214
- /**
215
- * Inititalize the quote with minimum requirement
216
- * @param array $orderSf
217
- */
218
- protected function _initQuote(array $orderSf, $storeId) {
219
-
220
- if(is_null($storeId)) {//just in case..
221
- $storeId = Mage::app()->getDefaultStoreView()->getId();
222
- }
223
-
224
- $this->_getQuote()->setStoreId($storeId);
225
-
226
- //Super mode is setted to bypass check item qty ;)
227
- $this->_getQuote()->setIsSuperMode(true);
228
-
229
- //Set boolean shopping flux and shipping prices in session for shopping method
230
- $this->getSession()->setIsShoppingFlux(true);
231
- //$this->getSession()->setShippingPrice((float)$orderSf['TotalShipping']);
232
-
233
- $this->_getQuote()->setCustomer($this->_customer);
234
- }
235
-
236
- /**
237
- * Create or Update customer with converter
238
- * @param array $data Data From ShoppingFlux
239
- */
240
- protected function _createCustomer(array $data, $storeId) {
241
- try {
242
-
243
- /* @var $convert_customer Profileolabs_Shoppingflux_Model_Manageorders_Convert_Customer */
244
- $convert_customer = Mage::getModel('profileolabs_shoppingflux/manageorders_convert_customer');
245
-
246
- $this->_customer = $convert_customer->toCustomer(current($data['BillingAddress']), $storeId);
247
- $billingAddress = $convert_customer->addresstoCustomer(current($data['BillingAddress']), $storeId, $this->_customer);
248
-
249
- $this->_customer->addAddress($billingAddress);
250
-
251
- $shippingAddress = $convert_customer->addresstoCustomer(current($data['ShippingAddress']), $storeId, $this->_customer, 'shipping');
252
- $this->_customer->addAddress($shippingAddress);
253
- $customerGroupId = $this->getConfig()->getCustomerGroupIdFor($data['Marketplace'], $storeId);
254
- if ($customerGroupId) {
255
- $this->_customer->setGroupId($customerGroupId);
256
- }
257
- $this->_customer->save();
258
- } catch (Exception $e) {
259
- Mage::throwException($e);
260
- }
261
- }
262
-
263
- public function createAllForOrder($orderSf, $storeId) {
264
- try {
265
-
266
- //$this->_quote = null;
267
- $this->_customer = null;
268
-
269
-
270
- //Create or Update customer with addresses
271
- $this->_createCustomer($orderSf, $storeId);
272
-
273
- $this->_initQuote($orderSf, $storeId);
274
-
275
- //Add products to quote with data from ShoppingFlux
276
- $this->_addProductsToQuote($orderSf);
277
-
278
- $order = null;
279
- if (!$this->isUnderVersion14())
280
- $order = $this->_saveOrder($orderSf);
281
- else
282
- $order = $this->_saveOrder13($orderSf);
283
-
284
-
285
- $this->_nb_orders_imported++;
286
-
287
- if (!is_null($order) && $order->getId())
288
- $this->_changeDateCreatedAt($order, $orderSf['OrderDate']);
289
-
290
- //Erase session for the next order
291
- $this->getSession()->clear();
292
- } catch (Exception $e) {
293
- $this->getHelper()->log($e->getMessage(), $orderSf['IdOrder']);
294
- //Erase session for the next order
295
- $this->getSession()->clear();
296
- }
297
- }
298
-
299
- protected function _changeDateCreatedAt($order, $date) {
300
- try {
301
-
302
- $order->setCreatedAt($date);
303
- //$order->setUpdatedAt($date);
304
- $order->save();
305
- } catch (Exception $e) {
306
- Mage::logException($e);
307
- Mage::throwException($message);
308
- }
309
- }
310
-
311
- /**
312
- * Add products to quote with data from ShoppinfFlux
313
- * @param array $orderSf
314
- */
315
- protected function _addProductsToQuote(array $orderSf) {
316
- $totalAmount = $orderSf['TotalAmount'];
317
- $productsSf = current($orderSf['Products']);
318
- $productsToIterate = current($productsSf);
319
-
320
-
321
-
322
-
323
- if (!$this->_customer->getDefaultBilling() || !$this->_customer->getDefaultShipping())
324
- $this->_customer->load($this->_customer->getId());
325
-
326
- $customerAddressBillingId = $this->_customer->getDefaultBilling();
327
- $customerAddressShippingId = $this->_customer->getDefaultShipping();
328
-
329
- //Set billing Address
330
- $addressBilling = $this->_getQuote()->getBillingAddress();
331
- //Make sure addresses will be saved without validation errors
332
- $addressBilling->setShouldIgnoreValidation(true);
333
- $customerAddressBilling = Mage::getModel('customer/address')->load($customerAddressBillingId);
334
- $addressBilling->importCustomerAddress($customerAddressBilling)->setSaveInAddressBook(0);
335
-
336
- //Set shipping Address
337
- $addressShipping = $this->_getQuote()->getShippingAddress();
338
- //Make sure addresses will be saved without validation errors
339
- $addressShipping->setShouldIgnoreValidation(true);
340
- $customerAddressShipping = Mage::getModel('customer/address')->load($customerAddressShippingId);
341
- $addressShipping->importCustomerAddress($customerAddressShipping)->setSaveInAddressBook(0);
342
- $addressShipping->setSameAsBilling(0);
343
-
344
-
345
- //Convert shipping price by tax rate
346
- $shippingPrice = (float) $orderSf['TotalShipping'];
347
- $this->getSession()->setShippingPrice($shippingPrice);
348
- if (!Mage::helper('tax')->shippingPriceIncludesTax() && Mage::helper('tax')->getShippingTaxClass(null)) {
349
- $percent = null;
350
- $pseudoProduct = new Varien_Object();
351
- $pseudoProduct->setTaxClassId(Mage::helper('tax')->getShippingTaxClass(null));
352
-
353
- $taxClassId = $pseudoProduct->getTaxClassId();
354
- if (is_null($percent)) {
355
- if ($taxClassId) {
356
- $request = Mage::getSingleton('tax/calculation')->getRateRequest($addressShipping, $addressBilling, null, null);
357
- $request->setProductClassId($taxClassId);
358
- $request->setCustomerClassId($this->_getQuote()->getCustomerTaxClassId());
359
- $percent = Mage::getSingleton('tax/calculation')->getRate($request);
360
-
361
- if ($percent !== false || !is_null($percent)) {
362
-
363
- $shippingPrice = $shippingPrice - ($shippingPrice / (100 + $percent) * $percent);
364
- $this->getSession()->setShippingPrice($shippingPrice);
365
- }
366
- }
367
- }
368
-
369
- //Mage::log("including tax = ".$includingTax." shipping price = ".$shippingPrice,null,'test_shipping_price.log');
370
- }
371
-
372
- //Set shipping Mehtod and collect shipping rates
373
- $addressShipping->setShippingMethod($this->_shippingMethod)->setCollectShippingRates(true);
374
-
375
-
376
-
377
-
378
- foreach ($productsToIterate as $key => $productSf) {
379
-
380
- $sku = $productSf['SKU'];
381
-
382
- if (($productId = $this->getProductModel()->getResource()->getIdBySku($sku)) != false) {
383
- $product = Mage::getModel('profileolabs_shoppingflux/manageorders_product')->load($productId); // $this->getProductModel()->reset()->load($productId);
384
-
385
- $request = new Varien_Object(array('qty' => $productSf['Quantity']));
386
- if ($product->getTypeId() == 'simple' && $product->getVisibility() == Mage_Catalog_Model_Product_Visibility::VISIBILITY_NOT_VISIBLE) {
387
-
388
- $parentIds = Mage::getResourceSingleton('catalog/product_type_configurable')
389
- ->getParentIdsByChild($product->getId());
390
-
391
- if (count($parentIds)) {
392
- $parentId = current($parentIds);
393
-
394
- $attributesConf = $this->getHelper()->getAttributesConfigurable($parentId);
395
- $superAttributes = array();
396
-
397
- foreach ($attributesConf as $attribute) {
398
-
399
- $attributeCode = $attribute['attribute_code'];
400
- $attributeId = $attribute['attribute_id'];
401
-
402
- $superAttributes[$attributeId] = $product->getData($attributeCode);
403
- }
404
-
405
- $product = Mage::getModel('profileolabs_shoppingflux/manageorders_product')->load($parentId);
406
-
407
- $request->setData('super_attribute', $superAttributes);
408
- }
409
- }
410
-
411
-
412
- $item = $this->_getQuote()->addProduct($product, $request);
413
-
414
- if (!is_object($item)) {
415
- $this->getSession()->clear();
416
- Mage::throwException("le produit sku = " . $sku . " n'a pas pu être ajouté! Id = " . $product->getId() . " Item = " . (string) $item);
417
- }
418
-
419
-
420
- //Save the quote with the new product
421
- $this->_getQuote()->save();
422
-
423
-
424
- $unitPrice = $productSf['Price'];
425
- if($this->getConfig()->applyTax() && !Mage::helper('tax')->priceIncludesTax()) {
426
- $taxClassId = $product->getTaxClassId();
427
- $request = Mage::getSingleton('tax/calculation')->getRateRequest($addressShipping, $addressBilling, null, null);
428
- $request->setProductClassId($taxClassId);
429
- $request->setCustomerClassId($this->_getQuote()->getCustomerTaxClassId());
430
- $percent = Mage::getSingleton('tax/calculation')->getRate($request);
431
- $unitPrice = $unitPrice / (1+$percent/100);
432
- }
433
-
434
-
435
- //Modify Item price
436
- $item->setCustomPrice($unitPrice);
437
- $item->setOriginalCustomPrice($unitPrice);
438
- $item->save();
439
-
440
- if (is_object($parentItem = $item->getParentItem())) {
441
- $parentItem->setCustomPrice($unitPrice);
442
- $parentItem->setOriginalCustomPrice($unitPrice);
443
- $parentItem->save();
444
- }
445
-
446
- //Mage::log(print_r($item->debug(),true),null,'debug_items.log');
447
- } else {
448
-
449
- $this->getSession()->clear();
450
- Mage::throwException("le produit sku = " . $sku . " n'existe plus en base!");
451
- }
452
- }
453
-
454
-
455
- $this->_getQuote()->collectTotals();
456
- $this->_getQuote()->save();
457
-
458
- //Set payment method
459
- /* @var $payment Mage_Sales_Quote_Payment */
460
- $this->_getQuote()->getShippingAddress()->setPaymentMethod($this->_paymentMethod);
461
- $payment = $this->_getQuote()->getPayment();
462
- $dataPayment = array('method' => $this->_paymentMethod, 'marketplace' => $orderSf['Marketplace']);
463
- $payment->importData($dataPayment);
464
- //$addressShipping->setShippingMethod($this->_shippingMethod)->setCollectShippingRates(true);
465
-
466
- $this->_getQuote()->collectTotals();
467
- $this->_getQuote()->save();
468
- }
469
-
470
- /**
471
- * Save the new order with the quote
472
- * @param array $orderSf
473
- */
474
- protected function _saveOrder(array $orderSf) {
475
- $orderIdShoppingFlux = (string) $orderSf['IdOrder'];
476
- $additionalData = array("from_shoppingflux" => 1,
477
- "marketplace_shoppingflux" => $orderSf['Marketplace'],
478
- "fees_shoppingflux" => (float) (isset($orderSf['Fees'])?$orderSf['Fees']:0),
479
- "order_id_shoppingflux" => $orderIdShoppingFlux);
480
-
481
- /* @var $service Mage_Sales_Model_Service_Quote */
482
- $service = Mage::getModel('sales/service_quote', $this->_getQuote());
483
- $service->setOrderData($additionalData);
484
- $order = false;
485
- if (method_exists($service, "submitAll")) {
486
-
487
- $service->submitAll();
488
- $order = $service->getOrder();
489
- } else {
490
- $order = $service->submit();
491
- }
492
-
493
- if ($order) {
494
- $newStatus = $this->getConfig()->getConfigData('shoppingflux_mo/manageorders/new_order_status', $order->getStoreId());
495
- if($newStatus) {
496
- $order->setStatus($newStatus);
497
- $order->save();
498
- }
499
-
500
-
501
-
502
- $this->_saveInvoice($order);
503
-
504
-
505
- $processingStatus = $this->getConfig()->getConfigData('shoppingflux_mo/manageorders/processing_order_status', $order->getStoreId());
506
- if($processingStatus) {
507
- $order->setStatus($processingStatus);
508
- $order->save();
509
- }
510
-
511
- //Set array with shopping flux ids
512
- $this->_ordersIdsImported[$orderIdShoppingFlux] = $orderSf['Marketplace'];
513
-
514
- return $order;
515
- }
516
-
517
- return null;
518
- }
519
-
520
- protected function _saveOrder13(array $orderSf) {
521
- $orderIdShoppingFlux = (string) $orderSf['IdOrder'];
522
- $additionalData = array("from_shoppingflux" => 1,
523
- "marketplace_shoppingflux" => $orderSf['Marketplace'],
524
- "fees_shoppingflux" => (float) (isset($orderSf['Fees'])?$orderSf['Fees']:0.0),
525
- "order_id_shoppingflux" => $orderIdShoppingFlux);
526
-
527
-
528
- $billing = $this->_getQuote()->getBillingAddress();
529
- $shipping = $this->_getQuote()->getShippingAddress();
530
-
531
- $this->_getQuote()->reserveOrderId();
532
- $convertQuote = Mage::getModel('sales/convert_quote');
533
- /* @var $convertQuote Mage_Sales_Model_Convert_Quote */
534
-
535
- $order = $convertQuote->addressToOrder($shipping);
536
-
537
- $order->addData($additionalData);
538
-
539
- /* @var $order Mage_Sales_Model_Order */
540
- $order->setBillingAddress($convertQuote->addressToOrderAddress($billing));
541
- $order->setShippingAddress($convertQuote->addressToOrderAddress($shipping));
542
-
543
- $order->setPayment($convertQuote->paymentToOrderPayment($this->_getQuote()->getPayment()));
544
-
545
- foreach ($this->_getQuote()->getAllItems() as $item) {
546
- $orderItem = $convertQuote->itemToOrderItem($item);
547
- if ($item->getParentItem()) {
548
- $orderItem->setParentItem($order->getItemByQuoteItemId($item->getParentItem()->getId()));
549
- }
550
- $order->addItem($orderItem);
551
- }
552
-
553
- /**
554
- * We can use configuration data for declare new order status
555
- */
556
- Mage::dispatchEvent('checkout_type_onepage_save_order', array('order' => $order, 'quote' => $this->getQuote()));
557
- //Mage::throwException(print_r($order->getData(),true));
558
- //die("<pre> DIE = ".print_r($order->getData()));
559
- $order->place();
560
-
561
- $order->setCustomerId($this->_getQuote()->getCustomer()->getId());
562
-
563
- $order->setEmailSent(false);
564
- $order->save();
565
-
566
- Mage::dispatchEvent('checkout_type_onepage_save_order_after', array('order' => $order, 'quote' => $this->getQuote()));
567
-
568
- $this->_getQuote()->setIsActive(false);
569
- $this->_getQuote()->save();
570
-
571
- ///////////////////////////////////////////////////////////////////////////
572
-
573
- if ($order) {
574
-
575
- $this->_saveInvoice($order);
576
-
577
- //Set array with shopping flux ids
578
- $this->_ordersIdsImported[$orderIdShoppingFlux] = $orderSf['Marketplace'];
579
-
580
- return $order;
581
- }
582
-
583
- return null;
584
- }
585
-
586
- /**
587
- * Create and Save invoice for the new order
588
- * @param Mage_Sales_Model_Order $order
589
- */
590
- protected function _saveInvoice($order) {
591
- Mage::dispatchEvent('checkout_type_onepage_save_order_after', array('order' => $order, 'quote' => $this->_getQuote()));
592
-
593
- if (!$this->getConfig()->createInvoice()) {
594
- return $this;
595
- }
596
-
597
- //Prepare invoice and save it
598
- $path = Mage::getBaseDir() . "/app/code/core/Mage/Sales/Model/Service/Order.php";
599
- $invoice = false;
600
- if (file_exists($path))
601
- $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
602
- else
603
- $invoice = $this->_initInvoice($order);
604
-
605
- if ($invoice) {
606
- $invoice->register();
607
- $invoice->getOrder()->setCustomerNoteNotify(false);
608
- $invoice->getOrder()->setIsInProcess(true);
609
-
610
-
611
-
612
- $transactionSave = Mage::getModel('core/resource_transaction')
613
- ->addObject($invoice)
614
- ->addObject($invoice->getOrder());
615
- $transactionSave->save();
616
- }
617
- }
618
-
619
- /**
620
- * Initialize invoice
621
- * @param Mage_Sales_Model_Order $order
622
- * @return Mage_Sales_Model_Order_Invoice $invoice
623
- */
624
- protected function _initInvoice($order) {
625
-
626
- $convertor = Mage::getModel('sales/convert_order');
627
- $invoice = $convertor->toInvoice($order);
628
- $update = false;
629
- $savedQtys = array();
630
- $itemsToInvoice = 0;
631
- /* @var $orderItem Mage_Sales_Model_Order_Item */
632
- foreach ($order->getAllItems() as $orderItem) {
633
-
634
- if (!$orderItem->isDummy() && !$orderItem->getQtyToInvoice() && $orderItem->getLockedDoInvoice()) {
635
- continue;
636
- }
637
-
638
- if ($order->getForcedDoShipmentWithInvoice() && $orderItem->getLockedDoShip()) {
639
- continue;
640
- }
641
-
642
- if (!$update && $orderItem->isDummy() && !empty($savedQtys) && !$this->_needToAddDummy($orderItem, $savedQtys)) {
643
- continue;
644
- }
645
- $item = $convertor->itemToInvoiceItem($orderItem);
646
-
647
- if (isset($savedQtys[$orderItem->getId()])) {
648
- $qty = $savedQtys[$orderItem->getId()];
649
- } else {
650
- if ($orderItem->isDummy()) {
651
- $qty = 1;
652
- } else {
653
- $qty = $orderItem->getQtyToInvoice();
654
- }
655
- }
656
- $itemsToInvoice += floatval($qty);
657
- $item->setQty($qty);
658
- $invoice->addItem($item);
659
-
660
- if ($itemsToInvoice <= 0) {
661
- Mage::throwException($this->__('Invoice without products could not be created.'));
662
- }
663
- }
664
-
665
-
666
- $invoice->collectTotals();
667
-
668
- return $invoice;
669
- }
670
-
671
- /**
672
- * Get Helper
673
- * @return Profileolabs_Shoppingflux_Model_Manageorders_Helper_Data
674
- */
675
- public function getHelper() {
676
- return Mage::helper('profileolabs_shoppingflux');
677
- }
678
-
679
- public function getNbOrdersImported() {
680
- return $this->_nb_orders_imported;
681
- }
682
-
683
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Profileolabs/Shoppingflux/controllers/{Export/Adminhtml → Adminhtml/Shoppingfeed/Export}/CategoryController.php RENAMED
@@ -8,7 +8,7 @@
8
  */
9
  include_once "Mage/Adminhtml/controllers/Catalog/CategoryController.php";
10
 
11
- class Profileolabs_Shoppingflux_Export_Adminhtml_CategoryController extends Mage_Adminhtml_Catalog_CategoryController {
12
 
13
  /**
14
  * Grid Action
8
  */
9
  include_once "Mage/Adminhtml/controllers/Catalog/CategoryController.php";
10
 
11
+ class Profileolabs_Shoppingflux_Adminhtml_Shoppingfeed_Export_CategoryController extends Mage_Adminhtml_Catalog_CategoryController {
12
 
13
  /**
14
  * Grid Action
app/code/community/Profileolabs/Shoppingflux/controllers/{Export/Adminhtml → Adminhtml/Shoppingfeed}/ExportController.php RENAMED
@@ -7,7 +7,7 @@
7
  * @author kassim belghait
8
  * @deprecated deprecated since 0.1.1
9
  */
10
- class Profileolabs_Shoppingflux_Export_Adminhtml_ExportController extends Mage_Adminhtml_Controller_Action {
11
 
12
  protected $_flowModel = null;
13
 
7
  * @author kassim belghait
8
  * @deprecated deprecated since 0.1.1
9
  */
10
+ class Profileolabs_Shoppingflux_Adminhtml_Shoppingfeed_ExportController extends Mage_Adminhtml_Controller_Action {
11
 
12
  protected $_flowModel = null;
13
 
app/code/community/Profileolabs/Shoppingflux/controllers/Adminhtml/{GeneralController.php → Shoppingfeed/GeneralController.php} RENAMED
@@ -5,7 +5,7 @@
5
  * @package Profileolabs_Shoppingflux
6
  * @author vincent enjalbert - web cooking
7
  */
8
- class Profileolabs_Shoppingflux_Adminhtml_GeneralController extends Mage_Adminhtml_Controller_Action
9
  {
10
  public function userdefinedAction() {
11
  $installer = Mage::getResourceModel('catalog/setup','profileolabs_shoppingflux_setup');
5
  * @package Profileolabs_Shoppingflux
6
  * @author vincent enjalbert - web cooking
7
  */
8
+ class Profileolabs_Shoppingflux_Adminhtml_Shoppingfeed_GeneralController extends Mage_Adminhtml_Controller_Action
9
  {
10
  public function userdefinedAction() {
11
  $installer = Mage::getResourceModel('catalog/setup','profileolabs_shoppingflux_setup');
app/code/community/Profileolabs/Shoppingflux/controllers/{Manageorders/Adminhtml → Adminhtml/Shoppingfeed/Order}/CronController.php RENAMED
@@ -5,7 +5,7 @@
5
  * @package Profileolabs_Shoppingflux_ManageOrders
6
  * @author Vincent Enjalbert
7
  */
8
- class Profileolabs_Shoppingflux_Manageorders_Adminhtml_CronController extends Mage_Adminhtml_Controller_Action
9
  {
10
  protected function _initAction() {
11
  $this->loadLayout()
5
  * @package Profileolabs_Shoppingflux_ManageOrders
6
  * @author Vincent Enjalbert
7
  */
8
+ class Profileolabs_Shoppingflux_Adminhtml_Shoppingfeed_Order_CronController extends Mage_Adminhtml_Controller_Action
9
  {
10
  protected function _initAction() {
11
  $this->loadLayout()
app/code/community/Profileolabs/Shoppingflux/controllers/{Manageorders/Adminhtml → Adminhtml/Shoppingfeed/Order}/ImportController.php RENAMED
@@ -6,7 +6,7 @@
6
  * @package Profileolabs_Shoppingflux_ManageOrders
7
  * @author kassim belghait
8
  */
9
- class Profileolabs_Shoppingflux_Manageorders_Adminhtml_ImportController extends Mage_Adminhtml_Controller_Action {
10
 
11
  protected function _initAction() {
12
  $this->loadLayout()
6
  * @package Profileolabs_Shoppingflux_ManageOrders
7
  * @author kassim belghait
8
  */
9
+ class Profileolabs_Shoppingflux_Adminhtml_Shoppingfeed_Order_ImportController extends Mage_Adminhtml_Controller_Action {
10
 
11
  protected function _initAction() {
12
  $this->loadLayout()
app/code/community/Profileolabs/Shoppingflux/controllers/{Manageorders/Adminhtml → Adminhtml/Shoppingfeed/Order}/LogController.php RENAMED
@@ -5,7 +5,7 @@
5
  * @package Profileolabs_Shoppingflux_ManageOrders
6
  * @author kassim belghait
7
  */
8
- class Profileolabs_Shoppingflux_Manageorders_Adminhtml_LogController extends Mage_Adminhtml_Controller_Action
9
  {
10
  protected function _initAction() {
11
  $this->loadLayout()
5
  * @package Profileolabs_Shoppingflux_ManageOrders
6
  * @author kassim belghait
7
  */
8
+ class Profileolabs_Shoppingflux_Adminhtml_Shoppingfeed_Order_LogController extends Mage_Adminhtml_Controller_Action
9
  {
10
  protected function _initAction() {
11
  $this->loadLayout()
app/code/community/Profileolabs/Shoppingflux/controllers/{Manageorders/Adminhtml → Adminhtml/Shoppingfeed}/OrderController.php RENAMED
@@ -5,7 +5,7 @@
5
  * @package Profileolabs_Shoppingflux_ManageOrders
6
  * @author kassim belghait
7
  */
8
- class Profileolabs_Shoppingflux_Manageorders_Adminhtml_OrderController extends Mage_Adminhtml_Controller_Action
9
  {
10
  protected function _initAction() {
11
  $this->loadLayout()
5
  * @package Profileolabs_Shoppingflux_ManageOrders
6
  * @author kassim belghait
7
  */
8
+ class Profileolabs_Shoppingflux_Adminhtml_Shoppingfeed_OrderController extends Mage_Adminhtml_Controller_Action
9
  {
10
  protected function _initAction() {
11
  $this->loadLayout()
app/code/community/Profileolabs/Shoppingflux/etc/adminhtml.xml CHANGED
@@ -11,17 +11,17 @@
11
  <children>
12
  <order translate="title" module="profileolabs_shoppingflux">
13
  <title>ShoppingFlux orders</title>
14
- <action>shoppingflux/manageorders_adminhtml_order</action>
15
  <sort_order>10</sort_order>
16
  </order>
17
  <import translate="title" module="profileolabs_shoppingflux">
18
  <title>ShoppingFlux order import</title>
19
- <action>shoppingflux/manageorders_adminhtml_import</action>
20
  <sort_order>20</sort_order>
21
  </import>
22
  <log translate="title" module="profileolabs_shoppingflux">
23
  <title>ShoppingFlux order log</title>
24
- <action>shoppingflux/manageorders_adminhtml_log</action>
25
  <sort_order>30</sort_order>
26
  </log>
27
  </children>
@@ -32,12 +32,12 @@
32
  <children>
33
  <show_flux translate="title" module="profileolabs_shoppingflux">
34
  <title>Feed List</title>
35
- <action>shoppingflux/export_adminhtml_export/show</action>
36
  <sort_order>10</sort_order>
37
  </show_flux>
38
  <set_product translate="title" module="profileolabs_shoppingflux">
39
  <title>Product Selection</title>
40
- <action>shoppingflux/export_adminhtml_export/update</action>
41
  <sort_order>20</sort_order>
42
  </set_product>
43
  </children>
@@ -45,12 +45,12 @@
45
  <crons translate="title" module="profileolabs_shoppingflux">
46
  <title>Cron log</title>
47
  <sort_order>900</sort_order>
48
- <action>shoppingflux/manageorders_adminhtml_cron</action>
49
  </crons>
50
  <!--<test translate="title" module="profileolabs_shoppingflux">
51
  <title>test</title>
52
  <sort_order>900</sort_order>
53
- <action>shoppingflux/adminhtml_general/test</action>
54
  </test>-->
55
  </children>
56
  </shoppingflux>
11
  <children>
12
  <order translate="title" module="profileolabs_shoppingflux">
13
  <title>ShoppingFlux orders</title>
14
+ <action>adminhtml/shoppingfeed_order</action>
15
  <sort_order>10</sort_order>
16
  </order>
17
  <import translate="title" module="profileolabs_shoppingflux">
18
  <title>ShoppingFlux order import</title>
19
+ <action>adminhtml/shoppingfeed_order_import</action>
20
  <sort_order>20</sort_order>
21
  </import>
22
  <log translate="title" module="profileolabs_shoppingflux">
23
  <title>ShoppingFlux order log</title>
24
+ <action>adminhtml/shoppingfeed_order_log</action>
25
  <sort_order>30</sort_order>
26
  </log>
27
  </children>
32
  <children>
33
  <show_flux translate="title" module="profileolabs_shoppingflux">
34
  <title>Feed List</title>
35
+ <action>adminhtml/shoppingfeed_export/show</action>
36
  <sort_order>10</sort_order>
37
  </show_flux>
38
  <set_product translate="title" module="profileolabs_shoppingflux">
39
  <title>Product Selection</title>
40
+ <action>adminhtml/shoppingfeed_export/update</action>
41
  <sort_order>20</sort_order>
42
  </set_product>
43
  </children>
45
  <crons translate="title" module="profileolabs_shoppingflux">
46
  <title>Cron log</title>
47
  <sort_order>900</sort_order>
48
+ <action>adminhtml/shoppingfeed_order_cron</action>
49
  </crons>
50
  <!--<test translate="title" module="profileolabs_shoppingflux">
51
  <title>test</title>
52
  <sort_order>900</sort_order>
53
+ <action>adminhtml_shoppingfeed_general/test</action>
54
  </test>-->
55
  </children>
56
  </shoppingflux>
app/code/community/Profileolabs/Shoppingflux/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Profileolabs_Shoppingflux>
5
- <version>0.9.9</version>
6
  </Profileolabs_Shoppingflux>
7
  </modules>
8
  <admin>
@@ -17,7 +17,7 @@
17
  <adminhtml>
18
  <args>
19
  <modules>
20
- <shoppingflux after="Mage_Adminhtml">Profileolabs_Shoppingflux</shoppingflux>
21
  </modules>
22
  </args>
23
  </adminhtml>
2
  <config>
3
  <modules>
4
  <Profileolabs_Shoppingflux>
5
+ <version>1.0.0</version>
6
  </Profileolabs_Shoppingflux>
7
  </modules>
8
  <admin>
17
  <adminhtml>
18
  <args>
19
  <modules>
20
+ <shoppingflux after="Mage_Adminhtml">Profileolabs_Shoppingflux_Adminhtml</shoppingflux>
21
  </modules>
22
  </args>
23
  </adminhtml>
app/code/community/Profileolabs/Shoppingflux/sql/profileolabs_shoppingflux_setup/.DS_Store DELETED
Binary file
app/design/adminhtml/default/default/layout/profileolabs_shoppingflux.xml CHANGED
@@ -8,27 +8,27 @@
8
  <block type="profileolabs_shoppingflux/adminhtml_register_notification" name="notification.shoppingfeed" template="profileolabs/shoppingflux/register/notification.phtml"></block>
9
  </reference>
10
  </default>
11
- <shoppingflux_manageorders_adminhtml_order_index>
12
  <reference name="content">
13
  <block type="profileolabs_shoppingflux/manageorders_adminhtml_order" name="manageorders.order.grid.container"></block>
14
  </reference>
15
- </shoppingflux_manageorders_adminhtml_order_index>
16
- <shoppingflux_manageorders_adminhtml_log_index>
17
  <reference name="content">
18
  <block type="profileolabs_shoppingflux/manageorders_adminhtml_log" name="manageorders.log.grid.container"></block>
19
  </reference>
20
- </shoppingflux_manageorders_adminhtml_log_index>
21
- <shoppingflux_manageorders_adminhtml_cron_index>
22
  <reference name="content">
23
  <block type="profileolabs_shoppingflux/manageorders_adminhtml_cron" name="manageorders.cron.grid.container"></block>
24
  </reference>
25
- </shoppingflux_manageorders_adminhtml_cron_index>
26
- <shoppingflux_manageorders_adminhtml_import_index>
27
  <reference name="content">
28
  <block type="profileolabs_shoppingflux/manageorders_adminhtml_import" name="manageorders.import" template="profileolabs/shoppingflux/manageorders/import.phtml"></block>
29
  </reference>
30
- </shoppingflux_manageorders_adminhtml_import_index>
31
- <shoppingflux_export_adminhtml_export_edit>
32
  <reference name="content">
33
  <block type="adminhtml/template" name="export.edit" template="profileolabs/shoppingflux/export/edit.phtml">
34
  <block type="adminhtml/store_switcher" name="store.switcher" >
@@ -36,8 +36,8 @@
36
  </block>
37
  </block>
38
  </reference>
39
- </shoppingflux_export_adminhtml_export_edit>
40
- <shoppingflux_export_adminhtml_export_update>
41
  <reference name="content">
42
  <block type="profileolabs_shoppingflux/export_adminhtml_product" name="products_list">
43
  <block type="adminhtml/store_switcher" name="store_switcher" as="store_switcher">
@@ -45,12 +45,12 @@
45
  </block>
46
  </block>
47
  </reference>
48
- </shoppingflux_export_adminhtml_export_update>
49
- <shoppingflux_export_adminhtml_export_show>
50
  <reference name="content">
51
  <block type="profileolabs_shoppingflux/export_adminhtml_feed" name="feed_list" />
52
  </reference>
53
- </shoppingflux_export_adminhtml_export_show>
54
 
55
 
56
  <adminhtml_sales_order_view>
8
  <block type="profileolabs_shoppingflux/adminhtml_register_notification" name="notification.shoppingfeed" template="profileolabs/shoppingflux/register/notification.phtml"></block>
9
  </reference>
10
  </default>
11
+ <adminhtml_shoppingfeed_order_index>
12
  <reference name="content">
13
  <block type="profileolabs_shoppingflux/manageorders_adminhtml_order" name="manageorders.order.grid.container"></block>
14
  </reference>
15
+ </adminhtml_shoppingfeed_order_index>
16
+ <adminhtml_shoppingfeed_order_log_index>
17
  <reference name="content">
18
  <block type="profileolabs_shoppingflux/manageorders_adminhtml_log" name="manageorders.log.grid.container"></block>
19
  </reference>
20
+ </adminhtml_shoppingfeed_order_log_index>
21
+ <adminhtml_shoppingfeed_order_cron_index>
22
  <reference name="content">
23
  <block type="profileolabs_shoppingflux/manageorders_adminhtml_cron" name="manageorders.cron.grid.container"></block>
24
  </reference>
25
+ </adminhtml_shoppingfeed_order_cron_index>
26
+ <adminhtml_shoppingfeed_order_import_index>
27
  <reference name="content">
28
  <block type="profileolabs_shoppingflux/manageorders_adminhtml_import" name="manageorders.import" template="profileolabs/shoppingflux/manageorders/import.phtml"></block>
29
  </reference>
30
+ </adminhtml_shoppingfeed_order_import_index>
31
+ <adminhtml_shoppingfeed_export_edit>
32
  <reference name="content">
33
  <block type="adminhtml/template" name="export.edit" template="profileolabs/shoppingflux/export/edit.phtml">
34
  <block type="adminhtml/store_switcher" name="store.switcher" >
36
  </block>
37
  </block>
38
  </reference>
39
+ </adminhtml_shoppingfeed_export_edit>
40
+ <adminhtml_shoppingfeed_export_update>
41
  <reference name="content">
42
  <block type="profileolabs_shoppingflux/export_adminhtml_product" name="products_list">
43
  <block type="adminhtml/store_switcher" name="store_switcher" as="store_switcher">
45
  </block>
46
  </block>
47
  </reference>
48
+ </adminhtml_shoppingfeed_export_update>
49
+ <adminhtml_shoppingfeed_export_show>
50
  <reference name="content">
51
  <block type="profileolabs_shoppingflux/export_adminhtml_feed" name="feed_list" />
52
  </reference>
53
+ </adminhtml_shoppingfeed_export_show>
54
 
55
 
56
  <adminhtml_sales_order_view>
app/design/adminhtml/default/default/template/profileolabs/shoppingflux/export/edit.phtml CHANGED
@@ -13,7 +13,7 @@
13
  <table class="form-list">
14
  <tr>
15
  <td class="scope-label">
16
- <button onclick="setLocation('<?php echo $this->getUrl('*/export_adminhtml_export/run',array('store'=>$storeId))?>')" type="button" class="scalable"><span><?php echo Mage::helper('profileolabs_shoppingflux')->__('ShoppingFlux Export') ?></span></button>
17
  </td>
18
  <td class="scope-label">
19
  <?php echo Mage::helper('profileolabs_shoppingflux')->__('ShoppingFlux Export')?>
13
  <table class="form-list">
14
  <tr>
15
  <td class="scope-label">
16
+ <button onclick="setLocation('<?php echo $this->getUrl('*/shoppingfeed_export/run',array('store'=>$storeId))?>')" type="button" class="scalable"><span><?php echo Mage::helper('profileolabs_shoppingflux')->__('ShoppingFlux Export') ?></span></button>
17
  </td>
18
  <td class="scope-label">
19
  <?php echo Mage::helper('profileolabs_shoppingflux')->__('ShoppingFlux Export')?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Profileolabs_Shoppingflux</name>
4
- <version>0.9.9</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/gpl-license.php">GNU General Public License (GPL)</license>
7
  <channel>community</channel>
@@ -11,9 +11,9 @@
11
  <notes>- Minor bugfixes &amp; improvements&#xD;
12
  </notes>
13
  <authors><author><name>ShoppingFlux</name><user>ShoppingFlux</user><email>olivier.levy@gmail.com</email></author></authors>
14
- <date>2015-10-22</date>
15
- <time>07:45:00</time>
16
- <contents><target name="magecommunity"><dir name="Profileolabs"><dir name="Shoppingflux"><dir name="Block"><dir name="Adminhtml"><dir name="Register"><file name="Notification.php" hash="13c5b3fccfd09dca376d4bc03f883384"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Fieldset"><file name="Abstract.php" hash="9046ac88c58d7768d28047c5102789ae"/></dir></dir></dir></dir></dir><dir name="Export"><dir name="Adminhtml"><dir name="Catalog"><dir name="Category"><dir name="Edit"><file name="Form.php" hash="da466a657f2b80567ef576711a190805"/></dir><dir name="Tab"><file name="Default.php" hash="b66202a43cdb1e3b178287aa1d7c1d2a"/></dir></dir></dir><file name="Feed.php" hash="a6bfac2be7c99ba5631626404e231ab0"/><file name="Process.php" hash="d5cd1471abfc8ea7f364dfb4610e4fd4"/><dir name="Product"><file name="Grid.php" hash="03b7aa3a458a0405d5d22ce7c0566033"/></dir><file name="Product.php" hash="f71a0d0f25e2484f74f1ceaeee514d3f"/><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Bool.php" hash="2717fd3964299bb372c355427c8136d7"/></dir></dir></dir></dir></dir><file name="Flow.php" hash="51cfa87ab0417ff26669a33bd22b50fa"/><file name="Flux.php" hash="c6da5407ccd3df3c5cd34883f02b9490"/><file name="Tracking.php" hash="a01f384121dda81f8ee3faa80ee3a32a"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir><dir name="Manageorders"><dir name="Adminhtml"><dir name="Cron"><file name="Grid.php" hash="ddfd5d9374446afafef1f545839e869e"/></dir><file name="Cron.php" hash="1a6a4042d3270b56e2dadc80f5c12cfa"/><file name="Import.php" hash="0d675a1731ca646ba57989b8545f4682"/><dir name="Log"><file name="Grid.php" hash="9170b01b3a6d3d558801faeba745390f"/></dir><file name="Log.php" hash="3336bc53002b82b4ab16d18a4e68e0cb"/><dir name="Order"><file name="Grid.php" hash="00cc7d1bb20437d8f7a547e0acfd7f9c"/><dir name="View"><dir name="Tab"><file name="Shoppingflux.php" hash="c0039acf525620c14cc8a1945d44150e"/></dir></dir></dir><file name="Order.php" hash="a6d45eb0146fb448f72348724c3151df"/><dir name="System"><dir name="Config"><dir name="Form"><dir name="Fieldset"><dir name="Shipping"><file name="Method.php" hash="3133c5e5e3f54a1605d8f59041fb5f1c"/></dir></dir></dir></dir></dir></dir><dir name="Payment"><dir name="Info"><file name="Purchaseorder.php" hash="df942f5c9a19506ef2bf70ca1d4da809"/></dir></dir></dir><dir name="Tracking"><file name="Buyline.php" hash="a60b19ed533b265a7a2aafe75c03c0fa"/><file name="Roi.php" hash="e34e26dffead694a35798d0397782d55"/></dir></dir><dir name="Helper"><file name="Data.php" hash="dbab029caf8bfd578042fef4c8b009b3"/></dir><dir name="Model"><dir name="Attribute"><dir name="Source"><file name="Category.php" hash="49f1f7959c4741c22bbf79b7e0bd24e7"/></dir></dir><dir name="Catalog"><dir name="Product"><file name="Collection.php" hash="8c3a5fe7c329059b6b85a1e0e5ee48fd"/></dir><dir name="Resource"><dir name="Eav"><file name="Attribute.php" hash="e0a9b926e138b9043f05d2da3e973883"/></dir></dir></dir><file name="Config.php" hash="74d82e33dabb7a09d0ba1c1d52e8e3f3"/><dir name="Export"><dir name="Convert"><dir name="Parser"><file name="Product.php" hash="4e50613b82ba84c35eb87f991645c118"/></dir></dir><file name="Flow.php" hash="842fa4b4a49ea86bdeb1cb0441433ccd"/><file name="Flux.php" hash="2438ff0b0b9858760a2a4c35fc0f030d"/><file name="Observer.php" hash="1c110fc1e4f81e26661f4ef42e431731"/><dir name="Rewrite"><dir name="Catalog"><file name="Config.php" hash="c87b13b0141123b80cb1ac33eaf75715"/></dir><dir name="CatalogInventory"><dir name="Stock"><file name="Item.php" hash="5249964f31fda6d5b7ff9587e713ca81"/></dir></dir></dir><dir name="Source"><file name="Attributes.php" hash="7c86df4782b77b69c59204a39766a787"/><file name="Attributesprice.php" hash="6cddf3b9562c8dbc56e670b377e341c1"/><dir name="Category"><file name="Level.php" hash="477d3dccefe5720eedc6b5d7a7110c9a"/></dir><dir name="Tracking"><file name="Delay.php" hash="9f375db7fac8d245dd72dc416d20ae28"/></dir><file name="Visibility.php" hash="c2a1494bc2e554074d19c58523c450b2"/></dir><file name="Updates.php" hash="6a12528f1ba69f0e0240ba471b471578"/><file name="Xml.php" hash="d6574955d2a108a91c1ebf84feb1b02b"/><file name="Xmlflow.deprecated.php" hash="960d81e05b332cdb16449029b07f0eca"/><file name="Xmlflow.php" hash="82815362cf6b2127ef961be79e48c127"/></dir><dir name="Manageorders"><dir name="Convert"><file name="Customer.php" hash="ad8f3406a1d5e9b7c093eaed069b39c6"/></dir><dir name="Export"><file name="Shipments.php" hash="20e617e183366ef5447ea653aa989065"/></dir><file name="Log.php" hash="a6c88fc107c3fa207265c97b8568c757"/><file name="Observer.php" hash="9dd7452c9fb70dc70e9c5343d8b1504b"/><file name="Order.php" hash="f12b03d0ba256c004ba6164b1b009600"/><file name="OrderOLD.php" hash="f25b3ce2d3610eecf201e2d2421aa460"/><dir name="Payment"><dir name="Method"><file name="Purchaseorder.php" hash="5f04df4c6792a54ba1358f1020f4415f"/></dir></dir><file name="Product.php" hash="0041c5ebcd0aa8ca17f5c1a4f07ec03d"/><dir name="Shipping"><dir name="Carrier"><file name="Shoppingflux.php" hash="7a94de78175c833705386ae1c5ddbe3d"/></dir><file name="Method.php" hash="a71d621b210ecdb1e69290f3e0c6f6d2"/></dir><dir name="Source"><file name="Attributes.php" hash="c9207872ddd962d6b0166d35cfe98626"/></dir></dir><dir name="Mysql4"><dir name="Export"><dir name="Flux"><file name="Collection.php" hash="25a6420bb66aeefb6a8ac0a9e6fc538f"/></dir><file name="Flux.php" hash="6140eeee9d40615eaaba736377aba17e"/><dir name="Updates"><file name="Collection.php" hash="21b355b1db82e4b8a5d1950ac2ffbd18"/></dir><file name="Updates.php" hash="02ef11d051020470231e470f3232f862"/></dir><dir name="Manageorders"><dir name="Export"><dir name="Shipments"><file name="Collection.php" hash="fcdf3c607a8d479beb10a53a618aa225"/></dir><file name="Shipments.php" hash="e06dfaf254a5fd3d8649685b56874258"/></dir><dir name="Log"><file name="Collection.php" hash="0efd8c68937edf98cc9f9bb35bd76f79"/></dir><file name="Log.php" hash="b30bbf3ead209d69993546b29f72ecd7"/><dir name="Shipping"><dir name="Method"><file name="Collection.php" hash="7b2c8fb56625953ea8cd79cc7ddcc9df"/></dir><file name="Method.php" hash="a919a6c61ad6ddefd19ffc287eaa7325"/></dir></dir></dir><dir name="Sales"><dir name="Service"><file name="Quote.php" hash="ebd9c8bd918e12d0c77c26a3ce42ccb5"/></dir></dir><dir name="Service"><dir name="Http"><dir name="Client"><dir name="Adapter"><file name="Curl.php" hash="659ab165cdd8492fdc7ee08b515732ac"/><file name="Stream.php" hash="c3a61972f5ffb625dba59ba53365965d"/></dir></dir></dir></dir><file name="Service.php" hash="3e1b05fa9e9a4ad27605bbc7586d2653"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Apikey.php" hash="90036cf58c627fcc68920af912171a0c"/><file name="Category.php" hash="7d25e1953c33d3176b2b510f5d0be381"/><file name="Refresh.php" hash="d53cbdc6ae73c146af67ef5f20d9e4e8"/></dir></dir></dir><file name=".DS_Store" hash="e7218be203fbe7f5c2243a9dea3bf55e"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="GeneralController.php" hash="ca99113377d353dbc4eecfdaea767fa2"/></dir><dir name="Export"><dir name="Adminhtml"><file name="CategoryController.php" hash="d882797e1e0fbff25b312768c6569f04"/><file name="ExportController.php" hash="15e395246d428bc7e390e1078a54a390"/></dir><file name="FluxController.php" hash="1e1b17ab3fef4eace620c7ea5d61c4ef"/></dir><dir name="Manageorders"><dir name="Adminhtml"><file name="CronController.php" hash="9c43b1b18fb883b4140aaa1d3f82cb1c"/><file name="ImportController.php" hash="31203b56860d102c1565fb7653b1a770"/><file name="LogController.php" hash="f744619a2283468d03e8a3f7f8f0c080"/><file name="OrderController.php" hash="acec967d5c7fa44fd3f716fc48f500a6"/></dir><file name="LaunchController.php" hash="38c4741a204c55c1b2225a2279f578bc"/></dir></dir><dir name="doc"><file name="ShoppingFeed_US.pdf" hash="0cd685730056d5f2f9c9f8292dead3ae"/><file name="ShoppingFlux_FR.pdf" hash="5590a49838bd67f70f0cacf9605cea2b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="fa2e007d1511d96ca9b37fe92eab2604"/><file name="config.xml" hash="7325da9bd74235c5a28c8e121ba9b49d"/><file name="system.xml" hash="93744c59f8947c27144595088ff9f259"/></dir><dir name="sql"><dir name="profileolabs_shoppingflux_setup"><file name="mysql4-install-0.1.0.php" hash="87c47ba97a55bd71dada152b52736be2"/><file name="mysql4-install-0.8.0.php" hash="48e14fe6bea37e0813d4e8011d97f9a9"/><file name="mysql4-install-0.8.5.php" hash="1aae90e495b0a281bb6916d425561620"/><file name="mysql4-install-0.8.6.php" hash="ae6e23c12465b3b091c3235598c20b0e"/><file name="mysql4-install-0.8.7.php" hash="7672f1e89056b6bd476bf7443937dd73"/><file name="mysql4-install-0.9.3.php" hash="33a66ff8e8d4505e0c68f2f027a00750"/><file name="mysql4-install-0.9.9.php" hash="c0f1233e4196ca2012c8c4f3838fd883"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="0f95646d855413c52928ed4c258aacb1"/><file name="mysql4-upgrade-0.3.13-0.3.14.php" hash="4f6a5399ad06457f0ebf57b33353ebe2"/><file name="mysql4-upgrade-0.3.14-0.3.15.php" hash="6215917eef61544fc6f4193d31956df4"/><file name="mysql4-upgrade-0.3.17-0.3.18.php" hash="112b34baecd80300682bda9ba69c8970"/><file name="mysql4-upgrade-0.4.2-0.4.3.php" hash="2322a9d2b5130bc78699c1953df87a04"/><file name="mysql4-upgrade-0.4.6-0.5.0.php" hash="02be6c02a8c77e642ef3e40ded1ba8be"/><file name="mysql4-upgrade-0.5.1-0.5.2.php" hash="0e5414628efee519deff6aff301651c7"/><file name="mysql4-upgrade-0.5.3-0.5.4.php" hash="9dfb5e5895a9a2973dba57a049d9d379"/><file name="mysql4-upgrade-0.5.5-0.5.6.php" hash="e0ebe03688b7eac8252efa0d5b9b4258"/><file name="mysql4-upgrade-0.6.5-0.6.6.php" hash="c58a1219b2858d50a3d72e77ac6ee43c"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="0804f52786bdd97024dee79eb4b68695"/><file name="mysql4-upgrade-0.7.9-0.8.0.php" hash="7fdd68eda7f3162e979995ed2d7f847d"/><file name="mysql4-upgrade-0.8.4-0.8.5.php" hash="edb5ea0572bdc0e75fd402aeaefc4858"/><file name="mysql4-upgrade-0.8.5-0.8.6.php" hash="a80ecd198b298fecbf6807eba980361e"/><file name="mysql4-upgrade-0.8.6-0.8.7.php" hash="b2f8a980fbace011ff9632198ae6c0a5"/><file name="mysql4-upgrade-0.9.0-0.9.1.php" hash="d8c3ba1dd0bbd12c20fc221e03ff2391"/><file name="mysql4-upgrade-0.9.2-0.9.3.php" hash="5e611f9c8f337cbee764e692721520e4"/><file name=".DS_Store" hash="05157f0d6ed36203dee120b9772e6b15"/></dir></dir><file name=".DS_Store" hash="70d8319e6c95b1083e4aa566a1e7f8f7"/></dir><file name=".DS_Store" hash="d3146c6d782e4b3220b6aaa51d65eccc"/></dir></target><target name="mageetc"><dir name="modules"><file name="Profileolabs_Shoppingflux.xml" hash="73ec83cf32c72884815a3cac9f754a54"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Profileolabs_Shoppingflux.csv" hash="bb846cd4e91b8d5b49c66c29afda5c52"/></dir><dir name="fr_FR"><file name="Profileolabs_Shoppingflux.csv" hash="e7b3eb4b163a56bfe6194264c308e8d9"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="d4de97001b4d68d165ea6b008541701a"/></dir><dir name="template"><dir name="profileolabs"><dir name="shoppingflux"><dir name="export"><dir name="category"><file name="edit.phtml" hash="8af812638245a0aa59a1c90aa6c20a4f"/></dir><file name="edit.phtml" hash="af3d64c7cb4b179cbf75b2def62d31f1"/><file name="feed.phtml" hash="e380f0fa763f112ff153976b97dc3704"/><file name="process.phtml" hash="1dee42b2f14c0862446e5b475aaccad3"/><file name="product.phtml" hash="3d93144b8eb1e16672d610d9c0c35092"/></dir><dir name="manageorders"><file name="import.phtml" hash="6fd3bca397be66fc17d340cfae558fe9"/><dir name="payment"><dir name="info"><file name="purchaseorder.phtml" hash="782768b0e4836b25f46443dda098db29"/></dir></dir><dir name="sales"><dir name="order"><dir name="invoice"><file name="total.phtml" hash="0d8d4aec814c41f80b9d9c475b5da3ae"/></dir><file name="total.phtml" hash="ad58dad0fd4007764f03c74cc5a6ca57"/><dir name="view"><dir name="tab"><file name="shoppingflux.phtml" hash="7492846bef04ca1f0419cd804e7c4599"/></dir></dir></dir></dir></dir><dir name="register"><file name="notification.phtml" hash="80e22e32016bbbfea1c4b8e66ba18579"/></dir><file name="register.phtml" hash="614dfd40a4e74c0db2667ba30aeb71e3"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="7fd081f5a153c3912b924fe5258cc468"/></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="7fd081f5a153c3912b924fe5258cc468"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="shoppingflux"><file name="ad.png" hash="b76c0f3e4a7084a88ba0527be9fdcc25"/><file name="ad.png.txt" hash="4b54b44ffcb31c68e84f9a553e7fac28"/><file name="logo_us.jpg" hash="cae9e6bcba9814193a59bb07d541edb6"/><file name="s_shoppingfeed.png" hash="8782818108e316533ad090c5b078866f"/><file name="s_shoppingfeed_1.jpg" hash="50b18c2dcbe3bbfa6d0bdb55787da06b"/></dir></dir><dir name="css"><file name="shoppingflux.css" hash="b607a6c8ed09795fdf9fe4876c6ca2d6"/></dir></dir></dir></dir></target><target name="magelocal"><dir name="Varien"><dir name="Data"><dir name="Form"><dir name="Element"><file name="Wcmultiselect.php" hash="304b59d32ecdd9205af1716e528ae4bd"/></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Profileolabs_Shoppingflux</name>
4
+ <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/gpl-license.php">GNU General Public License (GPL)</license>
7
  <channel>community</channel>
11
  <notes>- Minor bugfixes &amp; improvements&#xD;
12
  </notes>
13
  <authors><author><name>ShoppingFlux</name><user>ShoppingFlux</user><email>olivier.levy@gmail.com</email></author></authors>
14
+ <date>2015-10-23</date>
15
+ <time>15:54:40</time>
16
+ <contents><target name="magecommunity"><dir name="Profileolabs"><dir name="Shoppingflux"><dir name="Block"><dir name="Adminhtml"><dir name="Register"><file name="Notification.php" hash="13c5b3fccfd09dca376d4bc03f883384"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Fieldset"><file name="Abstract.php" hash="9046ac88c58d7768d28047c5102789ae"/></dir></dir></dir></dir></dir><dir name="Export"><dir name="Adminhtml"><dir name="Catalog"><dir name="Category"><dir name="Edit"><file name="Form.php" hash="da466a657f2b80567ef576711a190805"/></dir><dir name="Tab"><file name="Default.php" hash="da1c24f56e463d6e93488633fc41539d"/></dir></dir></dir><file name="Feed.php" hash="a6bfac2be7c99ba5631626404e231ab0"/><file name="Process.php" hash="d5cd1471abfc8ea7f364dfb4610e4fd4"/><dir name="Product"><file name="Grid.php" hash="03b7aa3a458a0405d5d22ce7c0566033"/></dir><file name="Product.php" hash="f71a0d0f25e2484f74f1ceaeee514d3f"/><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Bool.php" hash="2717fd3964299bb372c355427c8136d7"/></dir></dir></dir></dir></dir><file name="Flow.php" hash="51cfa87ab0417ff26669a33bd22b50fa"/><file name="Flux.php" hash="c6da5407ccd3df3c5cd34883f02b9490"/><file name="Tracking.php" hash="a01f384121dda81f8ee3faa80ee3a32a"/></dir><dir name="Manageorders"><dir name="Adminhtml"><dir name="Cron"><file name="Grid.php" hash="ddfd5d9374446afafef1f545839e869e"/></dir><file name="Cron.php" hash="1a6a4042d3270b56e2dadc80f5c12cfa"/><file name="Import.php" hash="0d675a1731ca646ba57989b8545f4682"/><dir name="Log"><file name="Grid.php" hash="9170b01b3a6d3d558801faeba745390f"/></dir><file name="Log.php" hash="3336bc53002b82b4ab16d18a4e68e0cb"/><dir name="Order"><file name="Grid.php" hash="00cc7d1bb20437d8f7a547e0acfd7f9c"/><dir name="View"><dir name="Tab"><file name="Shoppingflux.php" hash="c0039acf525620c14cc8a1945d44150e"/></dir></dir></dir><file name="Order.php" hash="a6d45eb0146fb448f72348724c3151df"/><dir name="System"><dir name="Config"><dir name="Form"><dir name="Fieldset"><dir name="Shipping"><file name="Method.php" hash="3133c5e5e3f54a1605d8f59041fb5f1c"/></dir></dir></dir></dir></dir></dir><dir name="Payment"><dir name="Info"><file name="Purchaseorder.php" hash="df942f5c9a19506ef2bf70ca1d4da809"/></dir></dir></dir><dir name="Tracking"><file name="Buyline.php" hash="a60b19ed533b265a7a2aafe75c03c0fa"/><file name="Roi.php" hash="e34e26dffead694a35798d0397782d55"/></dir></dir><dir name="Helper"><file name="Data.php" hash="dbab029caf8bfd578042fef4c8b009b3"/></dir><dir name="Model"><dir name="Attribute"><dir name="Source"><file name="Category.php" hash="49f1f7959c4741c22bbf79b7e0bd24e7"/></dir></dir><dir name="Catalog"><dir name="Product"><file name="Collection.php" hash="8c3a5fe7c329059b6b85a1e0e5ee48fd"/></dir><dir name="Resource"><dir name="Eav"><file name="Attribute.php" hash="e0a9b926e138b9043f05d2da3e973883"/></dir></dir></dir><file name="Config.php" hash="74d82e33dabb7a09d0ba1c1d52e8e3f3"/><dir name="Export"><dir name="Convert"><dir name="Parser"><file name="Product.php" hash="4e50613b82ba84c35eb87f991645c118"/></dir></dir><file name="Flow.php" hash="842fa4b4a49ea86bdeb1cb0441433ccd"/><file name="Flux.php" hash="8d2d66053332bc3072826351d933fdc0"/><file name="Observer.php" hash="1c110fc1e4f81e26661f4ef42e431731"/><dir name="Rewrite"><dir name="Catalog"><file name="Config.php" hash="c87b13b0141123b80cb1ac33eaf75715"/></dir><dir name="CatalogInventory"><dir name="Stock"><file name="Item.php" hash="5249964f31fda6d5b7ff9587e713ca81"/></dir></dir></dir><dir name="Source"><file name="Attributes.php" hash="7c86df4782b77b69c59204a39766a787"/><file name="Attributesprice.php" hash="6cddf3b9562c8dbc56e670b377e341c1"/><dir name="Category"><file name="Level.php" hash="477d3dccefe5720eedc6b5d7a7110c9a"/></dir><dir name="Tracking"><file name="Delay.php" hash="9f375db7fac8d245dd72dc416d20ae28"/></dir><file name="Visibility.php" hash="c2a1494bc2e554074d19c58523c450b2"/></dir><file name="Updates.php" hash="6a12528f1ba69f0e0240ba471b471578"/><file name="Xml.php" hash="d6574955d2a108a91c1ebf84feb1b02b"/><file name="Xmlflow.deprecated.php" hash="960d81e05b332cdb16449029b07f0eca"/><file name="Xmlflow.php" hash="82815362cf6b2127ef961be79e48c127"/></dir><dir name="Manageorders"><dir name="Convert"><file name="Customer.php" hash="ad8f3406a1d5e9b7c093eaed069b39c6"/></dir><dir name="Export"><file name="Shipments.php" hash="20e617e183366ef5447ea653aa989065"/></dir><file name="Log.php" hash="a6c88fc107c3fa207265c97b8568c757"/><file name="Observer.php" hash="ee39cd0d9acbff0ddfbe3017e3b70144"/><file name="Order.php" hash="f12b03d0ba256c004ba6164b1b009600"/><dir name="Payment"><dir name="Method"><file name="Purchaseorder.php" hash="5f04df4c6792a54ba1358f1020f4415f"/></dir></dir><file name="Product.php" hash="0041c5ebcd0aa8ca17f5c1a4f07ec03d"/><dir name="Shipping"><dir name="Carrier"><file name="Shoppingflux.php" hash="7a94de78175c833705386ae1c5ddbe3d"/></dir><file name="Method.php" hash="a71d621b210ecdb1e69290f3e0c6f6d2"/></dir><dir name="Source"><file name="Attributes.php" hash="c9207872ddd962d6b0166d35cfe98626"/></dir></dir><dir name="Mysql4"><dir name="Export"><dir name="Flux"><file name="Collection.php" hash="25a6420bb66aeefb6a8ac0a9e6fc538f"/></dir><file name="Flux.php" hash="6140eeee9d40615eaaba736377aba17e"/><dir name="Updates"><file name="Collection.php" hash="21b355b1db82e4b8a5d1950ac2ffbd18"/></dir><file name="Updates.php" hash="02ef11d051020470231e470f3232f862"/></dir><dir name="Manageorders"><dir name="Export"><dir name="Shipments"><file name="Collection.php" hash="fcdf3c607a8d479beb10a53a618aa225"/></dir><file name="Shipments.php" hash="e06dfaf254a5fd3d8649685b56874258"/></dir><dir name="Log"><file name="Collection.php" hash="0efd8c68937edf98cc9f9bb35bd76f79"/></dir><file name="Log.php" hash="b30bbf3ead209d69993546b29f72ecd7"/><dir name="Shipping"><dir name="Method"><file name="Collection.php" hash="7b2c8fb56625953ea8cd79cc7ddcc9df"/></dir><file name="Method.php" hash="a919a6c61ad6ddefd19ffc287eaa7325"/></dir></dir></dir><dir name="Sales"><dir name="Service"><file name="Quote.php" hash="ebd9c8bd918e12d0c77c26a3ce42ccb5"/></dir></dir><dir name="Service"><dir name="Http"><dir name="Client"><dir name="Adapter"><file name="Curl.php" hash="659ab165cdd8492fdc7ee08b515732ac"/><file name="Stream.php" hash="c3a61972f5ffb625dba59ba53365965d"/></dir></dir></dir></dir><file name="Service.php" hash="3e1b05fa9e9a4ad27605bbc7586d2653"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Apikey.php" hash="90036cf58c627fcc68920af912171a0c"/><file name="Category.php" hash="7d25e1953c33d3176b2b510f5d0be381"/><file name="Refresh.php" hash="d53cbdc6ae73c146af67ef5f20d9e4e8"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Shoppingfeed"><dir name="Export"><file name="CategoryController.php" hash="7aa5537d9aedd58aa6fdbcac31f8e10d"/></dir><file name="ExportController.php" hash="de6c4a519b3076946134858d6ddb8df2"/><file name="GeneralController.php" hash="9ac32875ecb62f0befad7993456d46d7"/><dir name="Order"><file name="CronController.php" hash="abb88558c15f2446ba09ca8a1cb48111"/><file name="ImportController.php" hash="2e2822fb67e89465eaae85bf254849b6"/><file name="LogController.php" hash="8905b421f3f12f4d1fd41a7e124826be"/></dir><file name="OrderController.php" hash="78b60bb37f0e43f23ee77d463458d5ae"/></dir></dir><dir name="Export"><file name="FluxController.php" hash="1e1b17ab3fef4eace620c7ea5d61c4ef"/></dir><dir name="Manageorders"><file name="LaunchController.php" hash="38c4741a204c55c1b2225a2279f578bc"/></dir></dir><dir name="doc"><file name="ShoppingFeed_US.pdf" hash="0cd685730056d5f2f9c9f8292dead3ae"/><file name="ShoppingFlux_FR.pdf" hash="5590a49838bd67f70f0cacf9605cea2b"/></dir><dir name="etc"><file name="adminhtml.xml" hash="385b2a7b1f745e8958c0e160a9df3514"/><file name="config.xml" hash="8320569528c118b5ef39e0cdcd9fe727"/><file name="system.xml" hash="93744c59f8947c27144595088ff9f259"/></dir><dir name="sql"><dir name="profileolabs_shoppingflux_setup"><file name="mysql4-install-0.1.0.php" hash="87c47ba97a55bd71dada152b52736be2"/><file name="mysql4-install-0.8.0.php" hash="48e14fe6bea37e0813d4e8011d97f9a9"/><file name="mysql4-install-0.8.5.php" hash="1aae90e495b0a281bb6916d425561620"/><file name="mysql4-install-0.8.6.php" hash="ae6e23c12465b3b091c3235598c20b0e"/><file name="mysql4-install-0.8.7.php" hash="7672f1e89056b6bd476bf7443937dd73"/><file name="mysql4-install-0.9.3.php" hash="33a66ff8e8d4505e0c68f2f027a00750"/><file name="mysql4-install-0.9.9.php" hash="c0f1233e4196ca2012c8c4f3838fd883"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="0f95646d855413c52928ed4c258aacb1"/><file name="mysql4-upgrade-0.3.13-0.3.14.php" hash="4f6a5399ad06457f0ebf57b33353ebe2"/><file name="mysql4-upgrade-0.3.14-0.3.15.php" hash="6215917eef61544fc6f4193d31956df4"/><file name="mysql4-upgrade-0.3.17-0.3.18.php" hash="112b34baecd80300682bda9ba69c8970"/><file name="mysql4-upgrade-0.4.2-0.4.3.php" hash="2322a9d2b5130bc78699c1953df87a04"/><file name="mysql4-upgrade-0.4.6-0.5.0.php" hash="02be6c02a8c77e642ef3e40ded1ba8be"/><file name="mysql4-upgrade-0.5.1-0.5.2.php" hash="0e5414628efee519deff6aff301651c7"/><file name="mysql4-upgrade-0.5.3-0.5.4.php" hash="9dfb5e5895a9a2973dba57a049d9d379"/><file name="mysql4-upgrade-0.5.5-0.5.6.php" hash="e0ebe03688b7eac8252efa0d5b9b4258"/><file name="mysql4-upgrade-0.6.5-0.6.6.php" hash="c58a1219b2858d50a3d72e77ac6ee43c"/><file name="mysql4-upgrade-0.7.7-0.7.8.php" hash="0804f52786bdd97024dee79eb4b68695"/><file name="mysql4-upgrade-0.7.9-0.8.0.php" hash="7fdd68eda7f3162e979995ed2d7f847d"/><file name="mysql4-upgrade-0.8.4-0.8.5.php" hash="edb5ea0572bdc0e75fd402aeaefc4858"/><file name="mysql4-upgrade-0.8.5-0.8.6.php" hash="a80ecd198b298fecbf6807eba980361e"/><file name="mysql4-upgrade-0.8.6-0.8.7.php" hash="b2f8a980fbace011ff9632198ae6c0a5"/><file name="mysql4-upgrade-0.9.0-0.9.1.php" hash="d8c3ba1dd0bbd12c20fc221e03ff2391"/><file name="mysql4-upgrade-0.9.2-0.9.3.php" hash="5e611f9c8f337cbee764e692721520e4"/></dir></dir></dir><file name=".DS_Store" hash="d3146c6d782e4b3220b6aaa51d65eccc"/></dir></target><target name="mageetc"><dir name="modules"><file name="Profileolabs_Shoppingflux.xml" hash="73ec83cf32c72884815a3cac9f754a54"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Profileolabs_Shoppingflux.csv" hash="bb846cd4e91b8d5b49c66c29afda5c52"/></dir><dir name="fr_FR"><file name="Profileolabs_Shoppingflux.csv" hash="e7b3eb4b163a56bfe6194264c308e8d9"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="d2ffb38fd9146dd1af653b8a3f45738b"/></dir><dir name="template"><dir name="profileolabs"><dir name="shoppingflux"><dir name="export"><dir name="category"><file name="edit.phtml" hash="8af812638245a0aa59a1c90aa6c20a4f"/></dir><file name="edit.phtml" hash="49c3739d62374c64cd9002d74c890a22"/><file name="feed.phtml" hash="e380f0fa763f112ff153976b97dc3704"/><file name="process.phtml" hash="1dee42b2f14c0862446e5b475aaccad3"/><file name="product.phtml" hash="3d93144b8eb1e16672d610d9c0c35092"/></dir><dir name="manageorders"><file name="import.phtml" hash="6fd3bca397be66fc17d340cfae558fe9"/><dir name="payment"><dir name="info"><file name="purchaseorder.phtml" hash="782768b0e4836b25f46443dda098db29"/></dir></dir><dir name="sales"><dir name="order"><dir name="invoice"><file name="total.phtml" hash="0d8d4aec814c41f80b9d9c475b5da3ae"/></dir><file name="total.phtml" hash="ad58dad0fd4007764f03c74cc5a6ca57"/><dir name="view"><dir name="tab"><file name="shoppingflux.phtml" hash="7492846bef04ca1f0419cd804e7c4599"/></dir></dir></dir></dir></dir><dir name="register"><file name="notification.phtml" hash="80e22e32016bbbfea1c4b8e66ba18579"/></dir><file name="register.phtml" hash="614dfd40a4e74c0db2667ba30aeb71e3"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="7fd081f5a153c3912b924fe5258cc468"/></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="profileolabs_shoppingflux.xml" hash="7fd081f5a153c3912b924fe5258cc468"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="shoppingflux"><file name="ad.png" hash="b76c0f3e4a7084a88ba0527be9fdcc25"/><file name="ad.png.txt" hash="4b54b44ffcb31c68e84f9a553e7fac28"/><file name="logo_us.jpg" hash="cae9e6bcba9814193a59bb07d541edb6"/><file name="s_shoppingfeed.png" hash="8782818108e316533ad090c5b078866f"/><file name="s_shoppingfeed_1.jpg" hash="50b18c2dcbe3bbfa6d0bdb55787da06b"/></dir></dir><dir name="css"><file name="shoppingflux.css" hash="b607a6c8ed09795fdf9fe4876c6ca2d6"/></dir></dir></dir></dir></target><target name="magelocal"><dir name="Varien"><dir name="Data"><dir name="Form"><dir name="Element"><file name="Wcmultiselect.php" hash="304b59d32ecdd9205af1716e528ae4bd"/></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>