Fianet_Core - Version 0.8.0

Version Notes

None

Download this release

Release Info

Developer Magento Core Team
Extension Fianet_Core
Version 0.8.0
Comparing to
See all releases


Code changes from version 0.7.9.2 to 0.8.0

Files changed (14) hide show
  1. app/code/community/Fianet/Core/Block/Sales/Order/Grid.php +13 -6
  2. app/code/community/Fianet/Core/Block/Widget/Grid/Column/Renderer/Fianet.php +1 -1
  3. app/code/community/Fianet/Core/Model/Fianet/Order/Payment.php +2 -2
  4. app/code/community/Fianet/Core/Model/Fianet/Order/Rnp.php +64 -42
  5. app/code/community/Fianet/Core/Model/Fianet/Order/Sac.php +49 -41
  6. app/code/community/Fianet/Core/Model/Fianet/Parser.php +6 -4
  7. app/code/community/Fianet/Core/Model/Fianet/Sender.php +3 -0
  8. app/code/community/Fianet/Core/Model/Source/ProductType.php +10 -10
  9. app/code/community/Fianet/Core/etc/config.xml +1 -1
  10. app/design/adminhtml/default/default/template/fianet/common/categoriestree.phtml +72 -10
  11. app/design/adminhtml/default/default/template/fianet/common/catproduct.phtml +3 -3
  12. app/etc/modules/ZFianet_Core.xml +1 -1
  13. app/locale/fr_FR/Fianet_Core.csv +7 -2
  14. package.xml +9 -9
app/code/community/Fianet/Core/Block/Sales/Order/Grid.php CHANGED
@@ -29,12 +29,15 @@ class Fianet_Core_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Sales_Orde
29
  ));
30
  }
31
 
32
- protected function _prepareMassaction()
33
  {
34
  parent::_prepareMassaction();
35
-
36
  if (Fianet_Core_Model_Configuration::CheckModuleIsInstalled('Fianet_Sac'))
37
  {
 
 
 
38
  $nb = 0;
39
  try
40
  {
@@ -50,13 +53,17 @@ class Fianet_Core_Block_Sales_Order_Grid extends Mage_Adminhtml_Block_Sales_Orde
50
  }
51
 
52
  Mage::getModel('sac/action')->GetReevaluation();
 
53
 
54
- $this->getMassactionBlock()->addItem('sent_sac', array(
55
- 'label'=> Mage::helper('fianet')->__('Sent to SAC FIA-NET'),
56
- 'url' => $this->getUrl('sac/order/sentSac'),
 
 
 
 
57
  ));
58
  }
59
  return $this;
60
  }
61
-
62
  }
29
  ));
30
  }
31
 
32
+ protected function _prepareMassaction()
33
  {
34
  parent::_prepareMassaction();
35
+
36
  if (Fianet_Core_Model_Configuration::CheckModuleIsInstalled('Fianet_Sac'))
37
  {
38
+ /*Retir� la reception des �valuations et des reevaluations dans la page commande pour �viter des lenteurs � l'ouverture de la page
39
+ * le cron est utilis� en remplacement
40
+
41
  $nb = 0;
42
  try
43
  {
53
  }
54
 
55
  Mage::getModel('sac/action')->GetReevaluation();
56
+ */
57
 
58
+ $this->getMassactionBlock()->addItem('sent_sac', array(
59
+ 'label'=> Mage::helper('fianet')->__('Sent to SAC FIA-NET'),
60
+ 'url' => $this->getUrl('sac/order/sentSac'),
61
+ ));
62
+ $this->getMassactionBlock()->addItem('get_eval', array(
63
+ 'label'=> Mage::helper('fianet')->__('Get evaluations'),
64
+ 'url' => $this->getUrl('sac/order/getEvaluation'),
65
  ));
66
  }
67
  return $this;
68
  }
 
69
  }
app/code/community/Fianet/Core/Block/Widget/Grid/Column/Renderer/Fianet.php CHANGED
@@ -10,7 +10,7 @@ class Fianet_Core_Block_Widget_Grid_Column_Renderer_Fianet extends Mage_Adminhtm
10
  {
11
  $html = $this->_renderRnP($row);
12
  }
13
- if ($row->Fianet_sac_sent != null)
14
  {
15
  $html = $this->_renderSac($row);
16
  }
10
  {
11
  $html = $this->_renderRnP($row);
12
  }
13
+ if ($row->Fianet_sac_sent != 0)
14
  {
15
  $html = $this->_renderSac($row);
16
  }
app/code/community/Fianet/Core/Model/Fianet/Order/Payment.php CHANGED
@@ -15,11 +15,11 @@ class Fianet_Core_Model_Fianet_Order_Payment
15
 
16
  public function set_cb_number($cb, $dateval)
17
  {
18
- if (!eregi("^[0-9]{16}$", $cb))
19
  {
20
  Mage::throwException("Mage_Fianet_Model_Fianet_Order_Payment::set_cb_number() - Cb number (".$cb.") format is invalid, must be 00001111222233334444");
21
  }
22
- else if (!eregi("^[0-9]{2}/[0-9]{4}$", $dateval))
23
  {
24
  Mage::throwException("Mage_Fianet_Model_Fianet_Order_Payment::set_cb_number() - Validity date (".$dateval.") format is invalid, must be MM/YYYY");
25
  }
15
 
16
  public function set_cb_number($cb, $dateval)
17
  {
18
+ if (!preg_match("^[0-9]{16}$", $cb))
19
  {
20
  Mage::throwException("Mage_Fianet_Model_Fianet_Order_Payment::set_cb_number() - Cb number (".$cb.") format is invalid, must be 00001111222233334444");
21
  }
22
+ else if (!preg_match("^[0-9]{2}/[0-9]{4}$", $dateval))
23
  {
24
  Mage::throwException("Mage_Fianet_Model_Fianet_Order_Payment::set_cb_number() - Validity date (".$dateval.") format is invalid, must be MM/YYYY");
25
  }
app/code/community/Fianet/Core/Model/Fianet/Order/Rnp.php CHANGED
@@ -181,49 +181,56 @@ class Fianet_Core_Model_Fianet_Order_Rnp
181
  $billing_address = $order->getBillingAddress();
182
  $shipping_address = $order->getShippingAddress();
183
 
184
- $RnPOrder->billing_user->nom = $billing_address->getLastname();
185
- $RnPOrder->billing_user->prenom = $billing_address->getFirstname();
186
- $RnPOrder->billing_user->telhome = eregi_replace("[^0-9]", "", $billing_address->getTelephone());
187
- $RnPOrder->billing_user->telfax = eregi_replace("[^0-9]", "", $billing_address->getFax());
188
- $RnPOrder->billing_user->email = $billing_address->getEmail() == '' ? $order->getCustomer_email() : $billing_address->getEmail();
189
- $RnPOrder->billing_user->societe = $billing_address->getCompany();
190
 
191
  if (trim($billing_address->getCompany()) != '')
192
  {
193
  $RnPOrder->billing_user->set_quality_professional();
194
  }
195
 
196
- $RnPOrder->billing_adress->rue1 = $billing_address->getStreet(1);
197
- $RnPOrder->billing_adress->rue2 = $billing_address->getStreet(2);
198
- $RnPOrder->billing_adress->cpostal = $billing_address->getPostcode();
199
- $RnPOrder->billing_adress->ville = $billing_address->getCity();
200
- $RnPOrder->billing_adress->pays = $billing_address->getCountry();
201
 
202
- if (!Fianet_Core_Model_Functions::compare_billing_and_shipping($billing_address, $shipping_address))
 
 
 
 
203
  {
204
- $RnPOrder->delivery_user = Mage::getModel('fianet/fianet_order_user_delivery');
205
- $RnPOrder->delivery_adress = Mage::getModel('fianet/fianet_order_adress_delivery');
206
-
207
- $RnPOrder->delivery_user->qualite = $RnPOrder->billing_user->qualite;
208
-
209
- $RnPOrder->delivery_user->nom = $shipping_address->getLastname();
210
- $RnPOrder->delivery_user->prenom = $shipping_address->getFirstname();
211
- $RnPOrder->delivery_user->telhome = eregi_replace("[^0-9]", "", $shipping_address->getTelephone());
212
- $RnPOrder->delivery_user->telfax = eregi_replace("[^0-9]", "", $shipping_address->getFax());
213
- $RnPOrder->delivery_user->email = $shipping_address->getEmail();
214
- $RnPOrder->delivery_user->societe = $shipping_address->getCompany();
215
-
216
- $RnPOrder->delivery_adress->rue1 = $shipping_address->getStreet(1);
217
- $RnPOrder->delivery_adress->rue2 = $shipping_address->getStreet(2);
218
- $RnPOrder->delivery_adress->cpostal = $shipping_address->getPostcode();
219
- $RnPOrder->delivery_adress->ville = $shipping_address->getCity();
220
- $RnPOrder->delivery_adress->pays = $shipping_address->getCountry();
 
 
 
221
  }
222
 
223
- $RnPOrder->info_commande->refid = $order->getRealOrderId();
224
- $RnPOrder->info_commande->devise = $order->getBaseCurrencyCode();
225
- $RnPOrder->info_commande->montant = $order->getTotalDue();
226
- $RnPOrder->info_commande->ip = $order->getRemoteIp();
227
  $RnPOrder->info_commande->timestamp = $order->getCreatedAt();
228
 
229
  $RnPOrder->info_commande->siteid = $configurationData->load('RNP_SITEID')->Value;
@@ -233,23 +240,38 @@ class Fianet_Core_Model_Fianet_Order_Rnp
233
  $RnPOrder->info_commande->siteid = $configurationData->load('RNP_SITEID')->Value;
234
  }
235
 
236
- //Zend_Debug::dump(Mage::getModel('fianet/carrier_abstract')->getCode($order->getShippingCarrier()));
237
- $shipping_code = Mage::getModel('fianet/carrier_abstract')->getCode($order->getShippingCarrier());
238
- $shipping = Mage::getModel('fianet/shipping_association')->load($shipping_code);
239
  $RnPOrder->info_commande->transport->type = $shipping->fianet_shipping_type;
240
  $RnPOrder->info_commande->transport->nom = $shipping->conveyor_name;
241
  $RnPOrder->info_commande->transport->rapidite = $shipping->delivery_times;
242
 
243
- foreach($order->getItemsCollection() as $item)
244
  {
245
- $product = Mage::getModel('fianet/fianet_order_info_productList_product');
246
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
247
  $product->type = Mage::getModel('fianet/product')->load($item->getProduct_id())->getFianetProductType();
248
- $product->prixunit = $item->getPrice();
249
- $product->name = $item->getName();
250
  $product->nb = (int)$item->getQtyOrdered();
251
- $product->ref = $item->getProduct_id();
252
  $RnPOrder->info_commande->list->add_product($product);
 
 
253
  }
254
 
255
  $RnPOrder->wallet->datelivr = Mage::getModel('fianet/functions')->get_delivery_date(self::getMaxShippingTimes($order), $configurationData, $order->getRealOrderId());
@@ -289,7 +311,7 @@ class Fianet_Core_Model_Fianet_Order_Rnp
289
  }
290
  }
291
  //Gestion du d�lais de livraison par transporteur
292
- $shipping_code = Mage::getModel('fianet/carrier_abstract')->getCode($order->getShippingCarrier());
293
  $transport_times_configured = Mage::getModel('receiveandpay/shipping_transport_times')
294
  ->setScope($store_id)
295
  ->load($shipping_code);
181
  $billing_address = $order->getBillingAddress();
182
  $shipping_address = $order->getShippingAddress();
183
 
184
+ $RnPOrder->billing_user->nom = $billing_address->getLastname();
185
+ $RnPOrder->billing_user->prenom = $billing_address->getFirstname();
186
+ $RnPOrder->billing_user->telhome = preg_replace("[^0-9]", "", $billing_address->getTelephone());
187
+ $RnPOrder->billing_user->telfax = preg_replace("[^0-9]", "", $billing_address->getFax());
188
+ $RnPOrder->billing_user->email = $billing_address->getEmail() == '' ? $order->getCustomer_email() : $billing_address->getEmail();
189
+ $RnPOrder->billing_user->societe = $billing_address->getCompany();
190
 
191
  if (trim($billing_address->getCompany()) != '')
192
  {
193
  $RnPOrder->billing_user->set_quality_professional();
194
  }
195
 
196
+ $RnPOrder->billing_adress->rue1 = $billing_address->getStreet(1);
197
+ $RnPOrder->billing_adress->rue2 = $billing_address->getStreet(2);
198
+ $RnPOrder->billing_adress->cpostal = $billing_address->getPostcode();
199
+ $RnPOrder->billing_adress->ville = $billing_address->getCity();
200
+ $RnPOrder->billing_adress->pays = $billing_address->getCountry();
201
 
202
+ //Zend_Debug::dump(Mage::getModel('fianet/carrier_abstract')->getCode($order->getShippingCarrier()));
203
+ //$shipping_code = $order->getShippingCarrier()->getCarrierCode();
204
+ $shipping = Mage::getModel('fianet/shipping_association')->load($order->getShippingCarrier()->getCarrierCode());
205
+
206
+ if ($shipping->fianet_shipping_type != '1' && $shipping->fianet_shipping_type != '2' )
207
  {
208
+ if (!Fianet_Core_Model_Functions::compare_billing_and_shipping($billing_address, $shipping_address))
209
+ {
210
+ $RnPOrder->delivery_user = Mage::getModel('fianet/fianet_order_user_delivery');
211
+ $RnPOrder->delivery_adress = Mage::getModel('fianet/fianet_order_adress_delivery');
212
+
213
+ $RnPOrder->delivery_user->qualite = $RnPOrder->billing_user->qualite;
214
+
215
+ $RnPOrder->delivery_user->nom = $shipping_address->getLastname();
216
+ $RnPOrder->delivery_user->prenom = $shipping_address->getFirstname();
217
+ $RnPOrder->delivery_user->telhome = preg_replace("[^0-9]", "", $shipping_address->getTelephone());
218
+ $RnPOrder->delivery_user->telfax = preg_replace("[^0-9]", "", $shipping_address->getFax());
219
+ $RnPOrder->delivery_user->email = $shipping_address->getEmail();
220
+ $RnPOrder->delivery_user->societe = $shipping_address->getCompany();
221
+
222
+ $RnPOrder->delivery_adress->rue1 = $shipping_address->getStreet(1);
223
+ $RnPOrder->delivery_adress->rue2 = $shipping_address->getStreet(2);
224
+ $RnPOrder->delivery_adress->cpostal = $shipping_address->getPostcode();
225
+ $RnPOrder->delivery_adress->ville = $shipping_address->getCity();
226
+ $RnPOrder->delivery_adress->pays = $shipping_address->getCountry();
227
+ }
228
  }
229
 
230
+ $RnPOrder->info_commande->refid = $order->getRealOrderId();
231
+ $RnPOrder->info_commande->devise = $order->getBaseCurrencyCode();
232
+ $RnPOrder->info_commande->montant = $order->getTotalDue();
233
+ $RnPOrder->info_commande->ip = $order->getRemoteIp();
234
  $RnPOrder->info_commande->timestamp = $order->getCreatedAt();
235
 
236
  $RnPOrder->info_commande->siteid = $configurationData->load('RNP_SITEID')->Value;
240
  $RnPOrder->info_commande->siteid = $configurationData->load('RNP_SITEID')->Value;
241
  }
242
 
243
+
 
 
244
  $RnPOrder->info_commande->transport->type = $shipping->fianet_shipping_type;
245
  $RnPOrder->info_commande->transport->nom = $shipping->conveyor_name;
246
  $RnPOrder->info_commande->transport->rapidite = $shipping->delivery_times;
247
 
248
+ foreach($order->getAllVisibleItems() as $item)
249
  {
 
250
 
251
+ $amount = $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $item->getBaseTaxAmount() + $item->getBaseWeeeTaxAppliedRowAmount();
252
+ //Zend_Debug::dump($amount, 'total');
253
+ //Zend_Debug::dump($item->getProduct_type(), 'product type');
254
+
255
+ $pName = $item->getName();
256
+ $pSku = $item->getSku();
257
+ if ($item->getProduct_type() == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE)
258
+ {
259
+ $children_product = $item->getChildrenItems();
260
+ if (count($children_product) == 1)
261
+ {
262
+ $pName = $children_product[0]->getName();
263
+ $pSku = $children_product[0]->getSku();
264
+ }
265
+ }
266
+ $product = Mage::getModel('fianet/fianet_order_info_productList_product');
267
  $product->type = Mage::getModel('fianet/product')->load($item->getProduct_id())->getFianetProductType();
268
+ $product->prixunit = $amount;
269
+ $product->name = $pName;
270
  $product->nb = (int)$item->getQtyOrdered();
271
+ $product->ref = $pSku;
272
  $RnPOrder->info_commande->list->add_product($product);
273
+
274
+
275
  }
276
 
277
  $RnPOrder->wallet->datelivr = Mage::getModel('fianet/functions')->get_delivery_date(self::getMaxShippingTimes($order), $configurationData, $order->getRealOrderId());
311
  }
312
  }
313
  //Gestion du d�lais de livraison par transporteur
314
+ $shipping_code = $order->getShippingCarrier()->getCarrierCode();
315
  $transport_times_configured = Mage::getModel('receiveandpay/shipping_transport_times')
316
  ->setScope($store_id)
317
  ->load($shipping_code);
app/code/community/Fianet/Core/Model/Fianet/Order/Sac.php CHANGED
@@ -35,16 +35,6 @@ class Fianet_Core_Model_Fianet_Order_Sac
35
  $this->delivery_adress = null;
36
  }
37
 
38
- public function load()
39
- {
40
- Zend_Debug::dump('loading order ' . $order->getId());
41
- //$scope_field =;
42
- $store_id = Zend_Debug::dump($order->getStore()->getId());
43
- Zend_Debug::dump($order->getStore()->getGroup()->getId());
44
- Zend_Debug::dump($order->getStore()->getGroup()->getWebsite()->getId());
45
- $store_id = $order->getStore();
46
- }
47
-
48
  public function get_xml($display_signature = false)
49
  {
50
  $xml = '';
@@ -80,7 +70,7 @@ class Fianet_Core_Model_Fianet_Order_Sac
80
  $xml .= $this->info_commande->get_xml();
81
  $xml .= $this->payment->get_xml();
82
  $xml .= '</control>';
83
-
84
  return ($xml);
85
  }
86
 
@@ -116,8 +106,8 @@ class Fianet_Core_Model_Fianet_Order_Sac
116
  //Zend_Debug::dump($billing_address,'$billing_address');
117
  $SacOrder->billing_user->nom = $billing_address->getLastname();
118
  $SacOrder->billing_user->prenom = $billing_address->getFirstname();
119
- $SacOrder->billing_user->telhome = eregi_replace("[^0-9]", "", $billing_address->getTelephone());
120
- $SacOrder->billing_user->telfax = eregi_replace("[^0-9]", "", $billing_address->getFax());
121
  $SacOrder->billing_user->email = $billing_address->getEmail() == '' ? $order->getCustomer_email() : $billing_address->getEmail();
122
  $SacOrder->billing_user->societe = $billing_address->getCompany();
123
 
@@ -132,25 +122,32 @@ class Fianet_Core_Model_Fianet_Order_Sac
132
  $SacOrder->billing_adress->ville = $billing_address->getCity();
133
  $SacOrder->billing_adress->pays = $billing_address->getCountry();
134
 
135
- if (!Fianet_Core_Model_Functions::compare_billing_and_shipping($billing_address, $shipping_address))
 
 
 
 
136
  {
137
- $SacOrder->delivery_user = Mage::getModel('fianet/fianet_order_user_delivery');
138
- $SacOrder->delivery_adress = Mage::getModel('fianet/fianet_order_adress_delivery');
139
-
140
- $SacOrder->delivery_user->qualite = $SacOrder->billing_user->qualite;
141
-
142
- $SacOrder->delivery_user->nom = $shipping_address->getLastname();
143
- $SacOrder->delivery_user->prenom = $shipping_address->getFirstname();
144
- $SacOrder->delivery_user->telhome = eregi_replace("[^0-9]", "", $shipping_address->getTelephone());
145
- $SacOrder->delivery_user->telfax = eregi_replace("[^0-9]", "", $shipping_address->getFax());
146
- $SacOrder->delivery_user->email = $shipping_address->getEmail();
147
- $SacOrder->delivery_user->societe = $shipping_address->getCompany();
148
-
149
- $SacOrder->delivery_adress->rue1 = $shipping_address->getStreet(1);
150
- $SacOrder->delivery_adress->rue2 = $shipping_address->getStreet(2);
151
- $SacOrder->delivery_adress->cpostal = $shipping_address->getPostcode();
152
- $SacOrder->delivery_adress->ville = $shipping_address->getCity();
153
- $SacOrder->delivery_adress->pays = $shipping_address->getCountry();
 
 
 
154
  }
155
 
156
  $SacOrder->info_commande->refid = $order->getRealOrderId();
@@ -166,27 +163,38 @@ class Fianet_Core_Model_Fianet_Order_Sac
166
  $SacOrder->info_commande->siteid = $configurationData->load('SAC_SITEID')->Value;
167
  }
168
 
169
- //Zend_Debug::dump(Mage::getModel('fianet/carrier_abstract')->getCode($order->getShippingCarrier()));
170
- $shipping_code = Mage::getModel('fianet/carrier_abstract')->getCode($order->getShippingCarrier());
171
- $shipping = Mage::getModel('fianet/shipping_association')->load($shipping_code);
172
  $SacOrder->info_commande->transport->type = $shipping->fianet_shipping_type;
173
  $SacOrder->info_commande->transport->nom = $shipping->conveyor_name;
174
  $SacOrder->info_commande->transport->rapidite = $shipping->delivery_times;
175
 
176
- foreach($order->getItemsCollection() as $item)
177
- {
178
- $product = Mage::getModel('fianet/fianet_order_info_productList_product');
179
 
 
 
 
 
 
 
 
 
 
 
 
 
180
  $product->type = Mage::getModel('fianet/product')->load($item->getProduct_id())->getFianetProductType();
181
- $product->prixunit = $item->getPrice();
182
- $product->name = $item->getName();
183
  $product->nb = (int)$item->getQtyOrdered();
184
- $product->ref = $item->getProduct_id();
185
  $SacOrder->info_commande->list->add_product($product);
 
 
186
  }
187
  $SacOrder->payment->type = Mage::getModel('sac/payment_association')->load($order->getPayment()->getMethod())->getValue();
188
 
189
- //Zend_Debug::dump($SacOrder);
190
  return ($SacOrder);
191
  }
192
 
35
  $this->delivery_adress = null;
36
  }
37
 
 
 
 
 
 
 
 
 
 
 
38
  public function get_xml($display_signature = false)
39
  {
40
  $xml = '';
70
  $xml .= $this->info_commande->get_xml();
71
  $xml .= $this->payment->get_xml();
72
  $xml .= '</control>';
73
+ //Zend_Debug::dump($xml);exit();
74
  return ($xml);
75
  }
76
 
106
  //Zend_Debug::dump($billing_address,'$billing_address');
107
  $SacOrder->billing_user->nom = $billing_address->getLastname();
108
  $SacOrder->billing_user->prenom = $billing_address->getFirstname();
109
+ $SacOrder->billing_user->telhome = preg_replace("[^0-9]", "", $billing_address->getTelephone());
110
+ $SacOrder->billing_user->telfax = preg_replace("[^0-9]", "", $billing_address->getFax());
111
  $SacOrder->billing_user->email = $billing_address->getEmail() == '' ? $order->getCustomer_email() : $billing_address->getEmail();
112
  $SacOrder->billing_user->societe = $billing_address->getCompany();
113
 
122
  $SacOrder->billing_adress->ville = $billing_address->getCity();
123
  $SacOrder->billing_adress->pays = $billing_address->getCountry();
124
 
125
+ //Zend_Debug::dump(Mage::getModel('fianet/carrier_abstract')->getCode($order->getShippingCarrier()));
126
+ $shipping_code = $order->getShippingCarrier()->getCarrierCode();
127
+ $shipping = Mage::getModel('fianet/shipping_association')->load($shipping_code);
128
+
129
+ if ($shipping->fianet_shipping_type != '1' && $shipping->fianet_shipping_type != '2' )
130
  {
131
+ if (!Fianet_Core_Model_Functions::compare_billing_and_shipping($billing_address, $shipping_address))
132
+ {
133
+ $SacOrder->delivery_user = Mage::getModel('fianet/fianet_order_user_delivery');
134
+ $SacOrder->delivery_adress = Mage::getModel('fianet/fianet_order_adress_delivery');
135
+
136
+ $SacOrder->delivery_user->qualite = $SacOrder->billing_user->qualite;
137
+
138
+ $SacOrder->delivery_user->nom = $shipping_address->getLastname();
139
+ $SacOrder->delivery_user->prenom = $shipping_address->getFirstname();
140
+ $SacOrder->delivery_user->telhome = preg_replace("[^0-9]", "", $shipping_address->getTelephone());
141
+ $SacOrder->delivery_user->telfax = preg_replace("[^0-9]", "", $shipping_address->getFax());
142
+ $SacOrder->delivery_user->email = $shipping_address->getEmail();
143
+ $SacOrder->delivery_user->societe = $shipping_address->getCompany();
144
+
145
+ $SacOrder->delivery_adress->rue1 = $shipping_address->getStreet(1);
146
+ $SacOrder->delivery_adress->rue2 = $shipping_address->getStreet(2);
147
+ $SacOrder->delivery_adress->cpostal = $shipping_address->getPostcode();
148
+ $SacOrder->delivery_adress->ville = $shipping_address->getCity();
149
+ $SacOrder->delivery_adress->pays = $shipping_address->getCountry();
150
+ }
151
  }
152
 
153
  $SacOrder->info_commande->refid = $order->getRealOrderId();
163
  $SacOrder->info_commande->siteid = $configurationData->load('SAC_SITEID')->Value;
164
  }
165
 
166
+
 
 
167
  $SacOrder->info_commande->transport->type = $shipping->fianet_shipping_type;
168
  $SacOrder->info_commande->transport->nom = $shipping->conveyor_name;
169
  $SacOrder->info_commande->transport->rapidite = $shipping->delivery_times;
170
 
171
+ foreach($order->getAllVisibleItems() as $item)
172
+ {
173
+ $pAmount = $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $item->getBaseTaxAmount() + $item->getBaseWeeeTaxAppliedRowAmount();
174
 
175
+ $pName = $item->getName();
176
+ $pSku = $item->getSku();
177
+ if ($item->getProduct_type() == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE)
178
+ {
179
+ $children_product = $item->getChildrenItems();
180
+ if (count($children_product) == 1)
181
+ {
182
+ $pName = $children_product[0]->getName();
183
+ $pSku = $children_product[0]->getSku();
184
+ }
185
+ }
186
+ $product = Mage::getModel('fianet/fianet_order_info_productList_product');
187
  $product->type = Mage::getModel('fianet/product')->load($item->getProduct_id())->getFianetProductType();
188
+ $product->prixunit = $pAmount;
189
+ $product->name = $pName;
190
  $product->nb = (int)$item->getQtyOrdered();
191
+ $product->ref = $pSku;
192
  $SacOrder->info_commande->list->add_product($product);
193
+
194
+
195
  }
196
  $SacOrder->payment->type = Mage::getModel('sac/payment_association')->load($order->getPayment()->getMethod())->getValue();
197
 
 
198
  return ($SacOrder);
199
  }
200
 
app/code/community/Fianet/Core/Model/Fianet/Parser.php CHANGED
@@ -10,7 +10,7 @@ class Fianet_Core_Model_Fianet_Parser
10
  {
11
  foreach ($xml_array['stack']['result'] as $result)
12
  {
13
- if (eregi("error", $result['attr']['retour']))
14
  {
15
  Mage::getModel('fianet/log')->Log("Parser.php - process_result() - Erreur : ".$result['attr']['message']);
16
  }
@@ -24,7 +24,7 @@ class Fianet_Core_Model_Fianet_Parser
24
  else
25
  {
26
  $res = $xml_array['stack']['result'];
27
- if (eregi("error", $res['attr']['retour']))
28
  {
29
  Mage::getModel('fianet/log')->Log("Parser.php - process_result() - Erreur : ".$res['attr']['message']);
30
  }
@@ -76,7 +76,8 @@ class Fianet_Core_Model_Fianet_Parser
76
  public function process_result_nostack($xml_array)
77
  {
78
  $evaluations = array();
79
- //Zend_Debug::dump($xml_array, 'xml_array');
 
80
  if ($xml_array['result']['attr']['retour'] == 'absente')
81
  {
82
  return ($evaluations);
@@ -105,7 +106,8 @@ class Fianet_Core_Model_Fianet_Parser
105
  {
106
  $evaluations[$eval['refid']] = $eval;
107
  }
108
- }
 
109
  return ($evaluations);
110
  }
111
 
10
  {
11
  foreach ($xml_array['stack']['result'] as $result)
12
  {
13
+ if (preg_match("error", $result['attr']['retour']))
14
  {
15
  Mage::getModel('fianet/log')->Log("Parser.php - process_result() - Erreur : ".$result['attr']['message']);
16
  }
24
  else
25
  {
26
  $res = $xml_array['stack']['result'];
27
+ if (preg_match("error", $res['attr']['retour']))
28
  {
29
  Mage::getModel('fianet/log')->Log("Parser.php - process_result() - Erreur : ".$res['attr']['message']);
30
  }
76
  public function process_result_nostack($xml_array)
77
  {
78
  $evaluations = array();
79
+ //Zend_Debug::dump($xml_array, 'xml_array');
80
+ Mage::getModel('fianet/log')->log('Parser->process_result_nostack(), return value : ' . $xml_array['result']['attr']['retour']);
81
  if ($xml_array['result']['attr']['retour'] == 'absente')
82
  {
83
  return ($evaluations);
106
  {
107
  $evaluations[$eval['refid']] = $eval;
108
  }
109
+ }
110
+
111
  return ($evaluations);
112
  }
113
 
app/code/community/Fianet/Core/Model/Fianet/Sender.php CHANGED
@@ -102,6 +102,8 @@ class Fianet_Core_Model_Fianet_Sender
102
  'Pwd' => $infos['password'],
103
  'Mode' => 'new',
104
  'Output' => 'new',
 
 
105
  'RepFT' => '0'
106
  );
107
  //Zend_Debug::dump($params);
@@ -110,6 +112,7 @@ class Fianet_Core_Model_Fianet_Sender
110
  $reevals = Mage::getModel('fianet/fianet_parser')->process_result_nostack($xml_array);
111
  $reevaluations = array_merge($reevaluations, $reevals);
112
  }
 
113
  return ($reevaluations);
114
  }
115
 
102
  'Pwd' => $infos['password'],
103
  'Mode' => 'new',
104
  'Output' => 'new',
105
+ //'Mode' => 'old',
106
+ //'Output' => 'old',
107
  'RepFT' => '0'
108
  );
109
  //Zend_Debug::dump($params);
112
  $reevals = Mage::getModel('fianet/fianet_parser')->process_result_nostack($xml_array);
113
  $reevaluations = array_merge($reevaluations, $reevals);
114
  }
115
+ //Zend_Debug::dump($reevaluations);
116
  return ($reevaluations);
117
  }
118
 
app/code/community/Fianet/Core/Model/Source/ProductType.php CHANGED
@@ -1,4 +1,4 @@
1
- <?php
2
 
3
  class Fianet_Core_Model_Source_ProductType
4
  {
@@ -9,21 +9,21 @@ class Fianet_Core_Model_Source_ProductType
9
  array('value' => 2, 'label' => Mage::helper('fianet')->__('Auto & moto')),
10
  array('value' => 3, 'label' => Mage::helper('fianet')->__('Culture & divertissements')),
11
  array('value' => 4, 'label' => Mage::helper('fianet')->__('Maison & jardin')),
12
- array('value' => 5, 'label' => Mage::helper('fianet')->__('Electrom&eacute;nager')),
13
- array('value' => 6, 'label' => Mage::helper('fianet')->__('Ench&egrave;res et achats group&eacute;s')),
14
  array('value' => 7, 'label' => Mage::helper('fianet')->__('Fleurs & cadeaux')),
15
  array('value' => 8, 'label' => Mage::helper('fianet')->__('Informatique & logiciels')),
16
- array('value' => 9, 'label' => Mage::helper('fianet')->__('Sant&eacute; & beaut&eacute;')),
17
  array('value' => 10, 'label' => Mage::helper('fianet')->__('Services aux particuliers')),
18
  array('value' => 11, 'label' => Mage::helper('fianet')->__('Services aux professionnels')),
19
  array('value' => 12, 'label' => Mage::helper('fianet')->__('Sport')),
20
- array('value' => 13, 'label' => Mage::helper('fianet')->__('V&ecirc;tements & accessoires')),
21
  array('value' => 14, 'label' => Mage::helper('fianet')->__('Voyage & tourisme')),
22
- array('value' => 15, 'label' => Mage::helper('fianet')->__('Hifi, photo & vid&eacute;os')),
23
- array('value' => 16, 'label' => Mage::helper('fianet')->__('T&eacute;l&eacute;phonie & communication')),
24
- array('value' => 17, 'label' => Mage::helper('fianet')->__('Bijoux et m&eacute;taux pr&eacute;cieux')),
25
- array('value' => 18, 'label' => Mage::helper('fianet')->__('Articles et accessoires pour b&eacute;b&eacute;')),
26
- array('value' => 19, 'label' => Mage::helper('fianet')->__('Sonorisation & lumi&egrave;re'))
27
  );
28
  }
29
  }
1
+ <?php
2
 
3
  class Fianet_Core_Model_Source_ProductType
4
  {
9
  array('value' => 2, 'label' => Mage::helper('fianet')->__('Auto & moto')),
10
  array('value' => 3, 'label' => Mage::helper('fianet')->__('Culture & divertissements')),
11
  array('value' => 4, 'label' => Mage::helper('fianet')->__('Maison & jardin')),
12
+ array('value' => 5, 'label' => Mage::helper('fianet')->__('Electroménager')),
13
+ array('value' => 6, 'label' => Mage::helper('fianet')->__('Enchères et achats groupés')),
14
  array('value' => 7, 'label' => Mage::helper('fianet')->__('Fleurs & cadeaux')),
15
  array('value' => 8, 'label' => Mage::helper('fianet')->__('Informatique & logiciels')),
16
+ array('value' => 9, 'label' => Mage::helper('fianet')->__('Santé & beauté')),
17
  array('value' => 10, 'label' => Mage::helper('fianet')->__('Services aux particuliers')),
18
  array('value' => 11, 'label' => Mage::helper('fianet')->__('Services aux professionnels')),
19
  array('value' => 12, 'label' => Mage::helper('fianet')->__('Sport')),
20
+ array('value' => 13, 'label' => Mage::helper('fianet')->__('Vêtements & accessoires')),
21
  array('value' => 14, 'label' => Mage::helper('fianet')->__('Voyage & tourisme')),
22
+ array('value' => 15, 'label' => Mage::helper('fianet')->__('Hifi, photo & vidéos')),
23
+ array('value' => 16, 'label' => Mage::helper('fianet')->__('Téléphonie & communication')),
24
+ array('value' => 17, 'label' => Mage::helper('fianet')->__('Bijoux et métaux précieux')),
25
+ array('value' => 18, 'label' => Mage::helper('fianet')->__('Articles et accessoires pour bébé')),
26
+ array('value' => 19, 'label' => Mage::helper('fianet')->__('Sonorisation & lumière'))
27
  );
28
  }
29
  }
app/code/community/Fianet/Core/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Fianet_Core>
5
- <version>0.7.9.2</version>
6
  </Fianet_Core>
7
  </modules>
8
  <admin>
2
  <config>
3
  <modules>
4
  <Fianet_Core>
5
+ <version>0.8.0</version>
6
  </Fianet_Core>
7
  </modules>
8
  <admin>
app/design/adminhtml/default/default/template/fianet/common/categoriestree.phtml CHANGED
@@ -67,7 +67,9 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
67
 
68
  this.storeId = parameters['store_id'];
69
 
70
-
 
 
71
 
72
  if ((typeof parameters['root_visible']) != 'undefined') {
73
  this.rootVisible = parameters['root_visible']*1;
@@ -158,15 +160,19 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
158
 
159
  categoryClick : function(node, e)
160
  {
161
- var url = '<?php echo $this->getEditUrl() ?>'+(this.storeId?'store/'+this.storeId+'/':'')+'id/'+node.id+'/';
162
- //alert(url);
 
 
 
163
  this.currentNodeId = node.id;
164
  this.addNodeTo = false;
165
  if (!this.useAjax) {
166
  setLocation(url);
167
  return;
168
  }
169
- updateContent(url);
 
170
  }
171
  });
172
 
@@ -416,15 +422,19 @@ function categoryMove(obj)
416
 
417
  var success = function(o) {
418
  try {
419
- if(o.responseText && o.responseText!=='SUCCESS'){
420
- alert(o.responseText);
421
- location.reload();
 
 
 
 
422
  }
423
  }
424
  catch(e) {
425
-
426
  }
427
  };
 
428
  var failure = function(o) {
429
  try {
430
  console.log(o.statusText);
@@ -477,7 +487,7 @@ function categoryMove(obj)
477
  /**
478
  * Update category content area
479
  */
480
- function updateContent(url, params, refreshTree) {
481
  if (!params) {
482
  params = {};
483
  }
@@ -490,6 +500,58 @@ function categoryMove(obj)
490
  var currentNode = tree.getNodeById(tree.currentNodeId);
491
  currentNode.setText(params.node_name);
492
  }*/
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
493
  var categoryContainer = $('category-edit-container');
494
  new Ajax.Updater(
495
  categoryContainer,
@@ -513,7 +575,7 @@ function categoryMove(obj)
513
  }
514
  );
515
  }
516
-
517
  /**
518
  * Refresh tree nodes after saving or deleting a category
519
  */
67
 
68
  this.storeId = parameters['store_id'];
69
 
70
+ if ( this.storeId != 0 && $('add_root_category_button')) {
71
+ $('add_root_category_button').hide();
72
+ }
73
 
74
  if ((typeof parameters['root_visible']) != 'undefined') {
75
  this.rootVisible = parameters['root_visible']*1;
160
 
161
  categoryClick : function(node, e)
162
  {
163
+ var baseUrl = '<?php echo $this->getEditUrl() ?>';
164
+ var urlExt = (this.storeId?'store/'+this.storeId+'/':'')+'id/'+node.id+'/';
165
+ var url = parseSidUrl(baseUrl, urlExt);
166
+ var params = {};
167
+
168
  this.currentNodeId = node.id;
169
  this.addNodeTo = false;
170
  if (!this.useAjax) {
171
  setLocation(url);
172
  return;
173
  }
174
+
175
+ updateContent(url, params);
176
  }
177
  });
178
 
422
 
423
  var success = function(o) {
424
  try {
425
+ if(o.responseText){
426
+ if(o.responseText==='SUCCESS'){
427
+ categoryForm.refreshPath();
428
+ } else {
429
+ alert(o.responseText);
430
+ location.reload();
431
+ }
432
  }
433
  }
434
  catch(e) {
 
435
  }
436
  };
437
+
438
  var failure = function(o) {
439
  try {
440
  console.log(o.statusText);
487
  /**
488
  * Update category content area
489
  */
490
+ function updateContent(url, params, refreshTree) {
491
  if (!params) {
492
  params = {};
493
  }
500
  var currentNode = tree.getNodeById(tree.currentNodeId);
501
  currentNode.setText(params.node_name);
502
  }*/
503
+ var categoryContainer = $('category-edit-container');
504
+ var messagesContainer = $('messages');
505
+ new Ajax.Request(url + (url.match(new RegExp('\\?')) ? '&isAjax=true' : '?isAjax=true' ), {
506
+ parameters: params,
507
+ evalScripts: true,
508
+ onComplete: refreshTree ? refreshTreeArea.bind(this) : false,
509
+ onSuccess: function(transport) {
510
+ try {
511
+ if (transport.responseText.isJSON()) {
512
+ var response = transport.responseText.evalJSON();
513
+ var needUpdate = true;
514
+ if (response.error) {
515
+ alert(response.message);
516
+ needUpdate = false;
517
+ }
518
+ if(response.ajaxExpired && response.ajaxRedirect) {
519
+ setLocation(response.ajaxRedirect);
520
+ needUpdate = false;
521
+ }
522
+ if (needUpdate){
523
+ if (response.content){
524
+ $(categoryContainer).update(response.content);
525
+ }
526
+ if (response.messages){
527
+ $(messagesContainer).update(response.messages);
528
+ }
529
+ }
530
+ } else {
531
+ $(categoryContainer).update(transport.responseText);
532
+ }
533
+ }
534
+ catch (e) {
535
+ $(categoryContainer).update(transport.responseText);
536
+ }
537
+ }
538
+ });
539
+ var headers = $$('div.content-header-floating');
540
+ for(var i=0; i<headers.length;i++) {
541
+ if (headers[i].down('div.content-header')) {
542
+ headers[i].down('div.content-header').remove();
543
+ }
544
+ }
545
+ }
546
+ /*
547
+ function updateContent(url, params, refreshTree) {
548
+ if (!params) {
549
+ params = {};
550
+ }
551
+ if (!params.form_key) {
552
+ params.form_key = FORM_KEY;
553
+ }
554
+
555
  var categoryContainer = $('category-edit-container');
556
  new Ajax.Updater(
557
  categoryContainer,
575
  }
576
  );
577
  }
578
+ */
579
  /**
580
  * Refresh tree nodes after saving or deleting a category
581
  */
app/design/adminhtml/default/default/template/fianet/common/catproduct.phtml CHANGED
@@ -5,7 +5,7 @@
5
  <p class="content-buttons form-buttons"><?php echo $this->getButtonsHtml('header') ?></p>
6
  </div>
7
  <?php echo $this->getFormHtml() ?>
8
- </script>
9
  <?php if ($this->hasFooterButtons()): ?>
10
  <div class="content-footer">
11
  <p class="content-buttons form-buttons"><?php echo $this->getButtonsHtml('footer') ?></p>
@@ -127,13 +127,13 @@
127
  }
128
  }
129
 
130
- function displayLoadingMask()
131
  {
132
  var loaderArea = $$('#html-body .wrapper')[0]; // Blocks all page
133
  Position.clone($(loaderArea), $('loading-mask'), {offsetLeft:-2});
134
  toggleSelectsUnderBlock($('loading-mask'), false);
135
  Element.show('loading-mask');
136
- }
137
  //]]>
138
 
139
  <?php echo $this->getChildHtml('googleoptimizer_js') ?>
5
  <p class="content-buttons form-buttons"><?php echo $this->getButtonsHtml('header') ?></p>
6
  </div>
7
  <?php echo $this->getFormHtml() ?>
8
+
9
  <?php if ($this->hasFooterButtons()): ?>
10
  <div class="content-footer">
11
  <p class="content-buttons form-buttons"><?php echo $this->getButtonsHtml('footer') ?></p>
127
  }
128
  }
129
 
130
+ /*function displayLoadingMask()
131
  {
132
  var loaderArea = $$('#html-body .wrapper')[0]; // Blocks all page
133
  Position.clone($(loaderArea), $('loading-mask'), {offsetLeft:-2});
134
  toggleSelectsUnderBlock($('loading-mask'), false);
135
  Element.show('loading-mask');
136
+ }*/
137
  //]]>
138
 
139
  <?php echo $this->getChildHtml('googleoptimizer_js') ?>
app/etc/modules/ZFianet_Core.xml CHANGED
@@ -11,7 +11,7 @@
11
  <depends>
12
  </depends>
13
  <!-- declare module's version information for database updates -->
14
- <version>0.7.9</version>
15
  </Fianet_Core>
16
  </modules>
17
  </config>
11
  <depends>
12
  </depends>
13
  <!-- declare module's version information for database updates -->
14
+ <version>0.8.0</version>
15
  </Fianet_Core>
16
  </modules>
17
  </config>
app/locale/fr_FR/Fianet_Core.csv CHANGED
@@ -138,7 +138,7 @@
138
  "%s items saved.","%s enregistrements sauvegardés."
139
  "Manage payment configuration","Gérer la configuration des moyens de paiement"
140
  "Payment methods","Méthodes de paiement"
141
- "Sent to SAC FIA-NET","Analyse SAC FIA-NET"
142
  "%s order(s) successfully sent to FIA-NET","%s commande(s) envoyées avec succès à FIA-NET"
143
  "%s evaluation(s) successfully receipted","%s évaluation(s) reçue(s) avec succès"
144
  "Error on transaction","Transaction en erreur"
@@ -184,4 +184,9 @@
184
  "Automatic invoicing","Facturation automatique"
185
  "Delivery time based on product attribute","Délai de livraison basé sur l'attribut produit"
186
  "Out of stock delivery time based on product attribute","Délai de livraison stock épuisé basé sur l'attribut produit"
187
- "Merchant maximum delivery times","Délais de livraison marchand maximum"
 
 
 
 
 
138
  "%s items saved.","%s enregistrements sauvegardés."
139
  "Manage payment configuration","Gérer la configuration des moyens de paiement"
140
  "Payment methods","Méthodes de paiement"
141
+ "Sent to SAC FIA-NET","FIA-NET : Analyse des commandes"
142
  "%s order(s) successfully sent to FIA-NET","%s commande(s) envoyées avec succès à FIA-NET"
143
  "%s evaluation(s) successfully receipted","%s évaluation(s) reçue(s) avec succès"
144
  "Error on transaction","Transaction en erreur"
184
  "Automatic invoicing","Facturation automatique"
185
  "Delivery time based on product attribute","Délai de livraison basé sur l'attribut produit"
186
  "Out of stock delivery time based on product attribute","Délai de livraison stock épuisé basé sur l'attribut produit"
187
+ "Merchant maximum delivery times","Délais de livraison marchand maximum"
188
+ "Get evaluations","FIA-NET : Récupérer les évaluations"
189
+ "Attempt to retrieve Reevaluation...","Tentative de récupération des réevaluations..."
190
+ "%s reevaluation found.","%s réévaluations trouvées."
191
+ "Order %s updated to eval %s","Commande %s mise à jour vers évaluation %s"
192
+ "Retrieving reevaluation ended.","Récupération des évaluations terminées."
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Fianet_Core</name>
4
- <version>0.7.9.2</version>
5
  <stability>stable</stability>
6
- <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL 3.O</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Fianet Core</summary>
10
- <description>Fianet Core</description>
11
- <notes>Compatible magento 1.4</notes>
12
- <authors><author><name>Fabrice Beck</name><user>auto-converted</user><email>kalliser@gmail.com</email></author><author><name>Romuald CAUFFET</name><user>auto-converted</user><email>romuald.cauffet@fia-net.fr</email></author></authors>
13
- <date>2010-04-09</date>
14
- <time>13:46:28</time>
15
- <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="fianet"><file name="attention.gif" hash="d85cab75ed2cba677829db26b1f0a6c2"/><file name="cb15.gif" hash="c9b308669efc27038043480400ab99e2"/><file name="fianet_SAC_icon.gif" hash="be9ce72c9a2bd81611a9e82537a8e15a"/><file name="icon_reset.gif" hash="1a883459cf1035dbc4fcd21c777af477"/><file name="ko.gif" hash="3d479be5db8b4b2ffa67612eeb5d47e1"/><file name="ok.gif" hash="1f6c46ba51a3f8732f62a65c0533f118"/><file name="RnP.gif" hash="d2f0083a5731f301b9a3bdcff327e19c"/><file name="rnp_tag.gif" hash="caeb5b7040352e4bcf7c3e09d4b1f085"/><file name="rond_rouge.gif" hash="c605401e88cd234a31691dc9e4a38b05"/><file name="rond_vert.gif" hash="ce704184ee159f7008f81af51a747e71"/><file name="rond_vertclair.gif" hash="b0310ca593cd539b88463d720df3cd60"/><file name="sof15.gif" hash="0f1e01ce195d2fb3da0700813a5ccd35"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="fianet.xml" hash="37b20e76d2dc7afdd2816fbc883eb9c9"/></dir><dir name="template"><dir name="fianet"><dir name="common"><file name="categoriestree.phtml" hash="3bb8fed1f85618d460d7d1931e42790a"/><file name="categorytreeformcontenair.phtml" hash="5002e67682c35c4ce979adf59c6605d0"/><file name="catproduct.phtml" hash="e001b6dd8d5b6d8f03c5111de7bd6e64"/><file name="shipping.phtml" hash="70fdd0041d41ba826e169bc0dfac4168"/><file name="storeswitcher.phtml" hash="255cb7ae4d4dc0a9967152595851c150"/><file name="test.php" hash="fc14c0b68962188fead13a27d79630fd"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Fianet"><dir name="Core"><dir name="Block"><dir name="Category"><dir name="Typeproduct"><dir name="Edit"><file name="Form.php" hash="352a9580a7d8d5537a46cf92f790e039"/></dir><file name="Edit.php" hash="5cc306c2dfe69c7c99a241ad11378986"/></dir></dir><dir name="Configuration"><dir name="Edit"><file name="Form.php" hash="6dfdd29d6cf7eece15c054a05f78fbc2"/></dir><file name="Content.php" hash="2666d1dc97da374db436f6c7cc1a3568"/><file name="Tab.php" hash="d3d348e305b5b626fe740ea15a1e03b0"/></dir><dir name="Log"><file name="Grid.php" hash="005297610bb516665ce1d949ac9ad762"/></dir><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="7f6c0663d807c714ee96627b45a7da4e"/></dir></dir><dir name="Store"><file name="Switcher.php" hash="1d1abef2cd836fb35310d44c2ac1515a"/></dir><dir name="Tree"><file name="Abstract.php" hash="4bdf942e7cc7701c7332e48be631726d"/><file name="TypeProduct.php" hash="1625959d2127bb4cd70c8003702333f0"/></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Filter"><file name="Fianet.php" hash="48fce9e46ab24d1ec019942a5f63f13d"/></dir><dir name="Renderer"><file name="Fianet.php" hash="c0d01433d99a2e59a45eb3f38d8c7aae"/></dir></dir></dir></dir><file name="Configuration.php" hash="679c2014da99aca8d279dec3207b67fa"/><file name="Fianetadmin.php" hash="966319f286bb8e1b3a3bbf449529b914"/><file name="Fianetadmingrid.php" hash="f90f159d8d4499a88595d122d52c4da6"/></dir><dir name="Controller"><dir name="Tree"><file name="Abstract.php" hash="63eec36c717c5f511e9f8f27c2086ee7"/><file name="TypeProduct.php" hash="c46431d9122397393cb7975861279823"/></dir></dir><dir name="controllers"><dir name="Category"><file name="TypeproductController.php" hash="a92fc9973a6da768db3803295ba73621"/></dir><file name="ConfigurationController.php" hash="7de80c72e09d7b40ad6de21e8126df63"/><file name="LogController.php" hash="a3eda90f82837f610f08babaae62dd6f"/><file name="ShippingController.php" hash="ee1b7f88cb937ae39741d2aee172bf4d"/></dir><dir name="etc"><file name="config.xml" hash="40305bf3b5e010986018318b2ccd971a"/></dir><dir name="Helper"><file name="Data.php" hash="7db899f5bff9055263a9d3bd5ae0a5db"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="7858ea5d31a311372a3ecd0d743a57ec"/></dir><dir name="Catproduct"><file name="Association.php" hash="70bfd086ca9b04afa4d0ce2a8c4b0970"/></dir><dir name="Configuration"><file name="Global.php" hash="3e168d458383b77700793dde522af600"/><file name="Value.php" hash="8febde7df94e4efc47092f2fa7907e21"/></dir><dir name="Fianet"><dir name="Order"><dir name="Adress"><file name="Base.php" hash="c4439959c06b4c0e749022e5c0d88658"/><file name="Billing.php" hash="a67859df048a2c3c9cc5ae8ee6e8f0ca"/><file name="Delivery.php" hash="bed14e9aadb444492112f60b3a3057d4"/></dir><dir name="Info"><dir name="ProductList"><file name="Product.php" hash="40c6825d6242196aebd65333228d652b"/></dir><file name="Productlist.php" hash="a228536d950b9d396b2cf70d24ebb7e8"/><file name="Rnp.php" hash="942a52baaec47d0f9bd5c0670ecdb326"/><file name="Sac.php" hash="9d34b9ac01f579e6b223fc56a2e9255c"/><file name="Transport.php" hash="784e8fd8631b0c23c2ded761312e7705"/></dir><dir name="User"><file name="Base.php" hash="bedaf6ad9a186286b67f8df2fc58a7a4"/><file name="Billing.php" hash="3deceebfee94c7d1cea9164c5005bf42"/><file name="Delivery.php" hash="31db57742dc47a18d420907497747f59"/><file name="Siteconso.php" hash="79175345426f673d3ce8dab417f27ce4"/></dir><file name="Payment.php" hash="77f95978202c1dc4dae4bb74382ad5e1"/><file name="Rnp.php" hash="8f678adfc43ec5361e9bd4a9c00a88fa"/><file name="Sac.php" hash="bb707fe36be096cb074c3d47d5aa4017"/><file name="Wallet.php" hash="939430dca8a83cb82641c2795b869c58"/></dir><dir name="Paramcallback"><file name="Builder.php" hash="926355988f9a8fcb5177e8fd8d174911"/><file name="Element.php" hash="c95fd0148793d4795aa3328e062c0c9a"/></dir><file name="EncodingKey.php" hash="844d14d819c6f4984239321371a3d548"/><file name="Hash32bits.php" hash="79f5ebb4be637ddc491c2576caf952ab"/><file name="Hash64bits.php" hash="13c32dd0329bbc8b2a51281ebe7c2594"/><file name="Parser.php" hash="69df91459d02952de1b94d896932c94b"/><file name="Sender.php" hash="c5de29eee5ea7534733d4a135397207c"/></dir><dir name="Mysql4"><dir name="Catproduct"><dir name="Association"><file name="Collection.php" hash="e05572d46730324e79f162baea4ec22c"/></dir><file name="Association.php" hash="bf9d19c299313c818be9f3fd89dba4e5"/></dir><dir name="Configuration"><dir name="Value"><file name="Collection.php" hash="e7d23d66717fe9619c18a73c49e7fdb3"/></dir><file name="Collection.php" hash="86df2463c56431203e22a7d53fae60ec"/><file name="Global.php" hash="2b9292b69f195f0352a66d7c2a8ebd9b"/><file name="Value.php" hash="7462c03db16a820dae5c6779f3bc684b"/></dir><dir name="Log"><file name="Collection.php" hash="ae2eb93de231104417afb8c0c9d76e5a"/></dir><dir name="Scope"><file name="Abstract.php" hash="2ee19dd3223713a7a1c882c5ce390f64"/></dir><dir name="Shipping"><dir name="Association"><file name="Collection.php" hash="d835d5ca6c420cf28e7a25fa91aeaeba"/></dir><file name="Association.php" hash="ea62bb032ae16489d2e163f1feb8ac7f"/></dir><file name="Abstract.php" hash="93f8c452dd8876f0de3c0ba1fa814879"/><file name="Configuration.php" hash="5626c157cd4faf725e0c40e17f2c0baa"/><file name="Log.php" hash="80037f49bcfd301c7784610902f2f5da"/><file name="Setup.php" hash="ab0bc73965d4c510d0e296103cfa2db2"/></dir><dir name="Scope"><file name="Abstract.php" hash="c7ee5ec3d9461e68bbe1baa6333c955c"/></dir><dir name="Shipping"><file name="Association.php" hash="8c988ac90bc259fbdf5faba7b634c9ff"/></dir><dir name="Source"><file name="DeliveryTimes.php" hash="399ba9fbc0e9dd261829351b0f511fd7"/><file name="ModeAction.php" hash="a4047c81cc3eaf77d1b2ec0629bf7cdf"/><file name="PaymentType.php" hash="d504c00aca03f3b4a542660cb3bd7df7"/><file name="ProductType.php" hash="4391ca848db1774da931c0c2d3c021fb"/><file name="ShippingType.php" hash="c421efd3ad231beac452311b76c11d15"/><file name="TypeProduct.php" hash="c5576b2edbf5e443b0387d105385158e"/></dir><file name="Configuration.php" hash="6cd7def3ec6177a86d80ed28c05f3a03"/><file name="Functions.php" hash="f7884317fad8ffde03aabc52c2a5c707"/><file name="Log.php" hash="cd7491b7a63c87698869dfafd0dd246e"/><file name="MageConfiguration.php" hash="5568896b071070c74f8d4b4a8fb0a3e2"/><file name="Product.php" hash="2148f45a495939cc8f43b3610c5c5bf1"/></dir><dir name="sql"><dir name="fianet_setup"><file name="mysql4-install-0.2.1.php" hash="569a89324a9a39db18c1bd9862f61e3d"/><file name="mysql4-upgrade-0.2.1-0.2.2.php" hash="6c7d28cd4888a9ad80d3f3839f10e41e"/><file name="mysql4-upgrade-0.2.2-0.5.7.php" hash="77939937c4c4f8451f2cae901c7f46c3"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Fianet_Core.csv" hash="78bff3f27be9a7e3bd147edd50fbed6f"/></dir></target><target name="mageetc"><dir name="modules"><file name="ZFianet_Core.xml" hash="502b5a53c727a3e93e84171b510b234a"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Fianet_Core</name>
4
+ <version>0.8.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>
8
  <extends/>
9
+ <summary>Fia-Net Core</summary>
10
+ <description>Fia-Net Core</description>
11
+ <notes>None</notes>
12
+ <authors><author><name>Beck Fabrice</name><user>auto-converted</user><email>kalliser@gmail.com</email></author></authors>
13
+ <date>2011-01-04</date>
14
+ <time>18:16:55</time>
15
+ <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="fianet"><file name="attention.gif" hash="d85cab75ed2cba677829db26b1f0a6c2"/><file name="cb15.gif" hash="c9b308669efc27038043480400ab99e2"/><file name="fianet_SAC_icon.gif" hash="be9ce72c9a2bd81611a9e82537a8e15a"/><file name="icon_reset.gif" hash="1a883459cf1035dbc4fcd21c777af477"/><file name="ko.gif" hash="3d479be5db8b4b2ffa67612eeb5d47e1"/><file name="ok.gif" hash="1f6c46ba51a3f8732f62a65c0533f118"/><file name="RnP.gif" hash="d2f0083a5731f301b9a3bdcff327e19c"/><file name="rnp_tag.gif" hash="caeb5b7040352e4bcf7c3e09d4b1f085"/><file name="rond_rouge.gif" hash="c605401e88cd234a31691dc9e4a38b05"/><file name="rond_vert.gif" hash="ce704184ee159f7008f81af51a747e71"/><file name="rond_vertclair.gif" hash="b0310ca593cd539b88463d720df3cd60"/><file name="sof15.gif" hash="0f1e01ce195d2fb3da0700813a5ccd35"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="fianet.xml" hash="37b20e76d2dc7afdd2816fbc883eb9c9"/></dir><dir name="template"><dir name="fianet"><dir name="common"><file name="categoriestree.phtml" hash="0f8091a777255d06d0bce7eaa03b6067"/><file name="categorytreeformcontenair.phtml" hash="5002e67682c35c4ce979adf59c6605d0"/><file name="catproduct.phtml" hash="c3d02fa825cd18217fba767417b24a6f"/><file name="shipping.phtml" hash="70fdd0041d41ba826e169bc0dfac4168"/><file name="storeswitcher.phtml" hash="255cb7ae4d4dc0a9967152595851c150"/><file name="test.php" hash="fc14c0b68962188fead13a27d79630fd"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Fianet"><dir name="Core"><dir name="Block"><file name="Configuration.php" hash="679c2014da99aca8d279dec3207b67fa"/><file name="Fianetadmin.php" hash="966319f286bb8e1b3a3bbf449529b914"/><file name="Fianetadmingrid.php" hash="f90f159d8d4499a88595d122d52c4da6"/><dir name="Category"><dir name="Typeproduct"><file name="Edit.php" hash="5cc306c2dfe69c7c99a241ad11378986"/><dir name="Edit"><file name="Form.php" hash="352a9580a7d8d5537a46cf92f790e039"/></dir></dir></dir><dir name="Configuration"><file name="Content.php" hash="2666d1dc97da374db436f6c7cc1a3568"/><file name="Tab.php" hash="d3d348e305b5b626fe740ea15a1e03b0"/><dir name="Edit"><file name="Form.php" hash="6dfdd29d6cf7eece15c054a05f78fbc2"/></dir></dir><dir name="Log"><file name="Grid.php" hash="005297610bb516665ce1d949ac9ad762"/></dir><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="706c73b1b7a8873718494bee99f0163d"/></dir></dir><dir name="Store"><file name="Switcher.php" hash="1d1abef2cd836fb35310d44c2ac1515a"/></dir><dir name="Tree"><file name="Abstract.php" hash="4bdf942e7cc7701c7332e48be631726d"/><file name="TypeProduct.php" hash="1625959d2127bb4cd70c8003702333f0"/></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Filter"><file name="Fianet.php" hash="48fce9e46ab24d1ec019942a5f63f13d"/></dir><dir name="Renderer"><file name="Fianet.php" hash="7521a6df9023abe8386d8845b3851180"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="ConfigurationController.php" hash="7de80c72e09d7b40ad6de21e8126df63"/><file name="LogController.php" hash="a3eda90f82837f610f08babaae62dd6f"/><file name="ShippingController.php" hash="ee1b7f88cb937ae39741d2aee172bf4d"/><dir name="Category"><file name="TypeproductController.php" hash="a92fc9973a6da768db3803295ba73621"/></dir></dir><dir name="Controller"><dir name="Tree"><file name="Abstract.php" hash="63eec36c717c5f511e9f8f27c2086ee7"/><file name="TypeProduct.php" hash="c46431d9122397393cb7975861279823"/></dir></dir><dir name="etc"><file name="config.xml" hash="ba7eea84c38ffc47aad15b7dd46ce26b"/></dir><dir name="Helper"><file name="Data.php" hash="7db899f5bff9055263a9d3bd5ae0a5db"/></dir><dir name="Model"><file name="Configuration.php" hash="6cd7def3ec6177a86d80ed28c05f3a03"/><file name="Functions.php" hash="f7884317fad8ffde03aabc52c2a5c707"/><file name="Log.php" hash="cd7491b7a63c87698869dfafd0dd246e"/><file name="MageConfiguration.php" hash="5568896b071070c74f8d4b4a8fb0a3e2"/><file name="Product.php" hash="2148f45a495939cc8f43b3610c5c5bf1"/><dir name="Carrier"><file name="Abstract.php" hash="7858ea5d31a311372a3ecd0d743a57ec"/></dir><dir name="Catproduct"><file name="Association.php" hash="70bfd086ca9b04afa4d0ce2a8c4b0970"/></dir><dir name="Configuration"><file name="Global.php" hash="3e168d458383b77700793dde522af600"/><file name="Value.php" hash="8febde7df94e4efc47092f2fa7907e21"/></dir><dir name="Fianet"><file name="EncodingKey.php" hash="844d14d819c6f4984239321371a3d548"/><file name="Hash32bits.php" hash="79f5ebb4be637ddc491c2576caf952ab"/><file name="Hash64bits.php" hash="13c32dd0329bbc8b2a51281ebe7c2594"/><file name="Parser.php" hash="24db3b9a3e4be662989c47141a62f3a0"/><file name="Sender.php" hash="d3b9a93bf0d17298a913b5f6bb551ceb"/><dir name="Order"><file name="Payment.php" hash="43e04bcc723eca9c18ca709f79906b40"/><file name="Rnp.php" hash="997c5a0494b6dc44333a6d4aa780868e"/><file name="Sac.php" hash="91423982d32db0efcf602bd78a68e8a5"/><file name="Wallet.php" hash="939430dca8a83cb82641c2795b869c58"/><dir name="Adress"><file name="Base.php" hash="c4439959c06b4c0e749022e5c0d88658"/><file name="Billing.php" hash="a67859df048a2c3c9cc5ae8ee6e8f0ca"/><file name="Delivery.php" hash="bed14e9aadb444492112f60b3a3057d4"/></dir><dir name="Info"><file name="Productlist.php" hash="a228536d950b9d396b2cf70d24ebb7e8"/><file name="Rnp.php" hash="942a52baaec47d0f9bd5c0670ecdb326"/><file name="Sac.php" hash="9d34b9ac01f579e6b223fc56a2e9255c"/><file name="Transport.php" hash="784e8fd8631b0c23c2ded761312e7705"/><dir name="ProductList"><file name="Product.php" hash="40c6825d6242196aebd65333228d652b"/></dir></dir><dir name="User"><file name="Base.php" hash="bedaf6ad9a186286b67f8df2fc58a7a4"/><file name="Billing.php" hash="3deceebfee94c7d1cea9164c5005bf42"/><file name="Delivery.php" hash="31db57742dc47a18d420907497747f59"/><file name="Siteconso.php" hash="79175345426f673d3ce8dab417f27ce4"/></dir></dir><dir name="Paramcallback"><file name="Builder.php" hash="926355988f9a8fcb5177e8fd8d174911"/><file name="Element.php" hash="c95fd0148793d4795aa3328e062c0c9a"/></dir></dir><dir name="Mysql4"><file name="Abstract.php" hash="93f8c452dd8876f0de3c0ba1fa814879"/><file name="Configuration.php" hash="5626c157cd4faf725e0c40e17f2c0baa"/><file name="Log.php" hash="80037f49bcfd301c7784610902f2f5da"/><file name="Setup.php" hash="ab0bc73965d4c510d0e296103cfa2db2"/><dir name="Catproduct"><file name="Association.php" hash="bf9d19c299313c818be9f3fd89dba4e5"/><dir name="Association"><file name="Collection.php" hash="e05572d46730324e79f162baea4ec22c"/></dir></dir><dir name="Configuration"><file name="Collection.php" hash="86df2463c56431203e22a7d53fae60ec"/><file name="Global.php" hash="2b9292b69f195f0352a66d7c2a8ebd9b"/><file name="Value.php" hash="7462c03db16a820dae5c6779f3bc684b"/><dir name="Value"><file name="Collection.php" hash="e7d23d66717fe9619c18a73c49e7fdb3"/></dir></dir><dir name="Log"><file name="Collection.php" hash="ae2eb93de231104417afb8c0c9d76e5a"/></dir><dir name="Scope"><file name="Abstract.php" hash="2ee19dd3223713a7a1c882c5ce390f64"/></dir><dir name="Shipping"><file name="Association.php" hash="ea62bb032ae16489d2e163f1feb8ac7f"/><dir name="Association"><file name="Collection.php" hash="d835d5ca6c420cf28e7a25fa91aeaeba"/></dir></dir></dir><dir name="Scope"><file name="Abstract.php" hash="c7ee5ec3d9461e68bbe1baa6333c955c"/></dir><dir name="Shipping"><file name="Association.php" hash="8c988ac90bc259fbdf5faba7b634c9ff"/></dir><dir name="Source"><file name="DeliveryTimes.php" hash="399ba9fbc0e9dd261829351b0f511fd7"/><file name="ModeAction.php" hash="a4047c81cc3eaf77d1b2ec0629bf7cdf"/><file name="PaymentType.php" hash="d504c00aca03f3b4a542660cb3bd7df7"/><file name="ProductType.php" hash="eeba65fe817ceacf81caacb2d90aed0f"/><file name="ShippingType.php" hash="c421efd3ad231beac452311b76c11d15"/><file name="TypeProduct.php" hash="c5576b2edbf5e443b0387d105385158e"/></dir></dir><dir name="sql"><dir name="fianet_setup"><file name="mysql4-install-0.2.1.php" hash="569a89324a9a39db18c1bd9862f61e3d"/><file name="mysql4-upgrade-0.2.1-0.2.2.php" hash="6c7d28cd4888a9ad80d3f3839f10e41e"/><file name="mysql4-upgrade-0.2.2-0.5.7.php" hash="77939937c4c4f8451f2cae901c7f46c3"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Fianet_Core.csv" hash="d63ffe45e7055bd756c6c7a1b7b88a00"/></dir></target><target name="mageetc"><dir name="modules"><file name="ZFianet_Core.xml" hash="8f2a8e522fd570020cca04ca8e05ab78"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>