Brainsins_Recommender - Version 1.5.4

Version Notes

Unified price tracking
Added an option to import custom styling script

Download this release

Release Info

Developer Magento Core Team
Extension Brainsins_Recommender
Version 1.5.4
Comparing to
See all releases


Code changes from version 1.5.3 to 1.5.4

Files changed (10) hide show
  1. app/code/community/Brainsins/Recsins/Block/Adminhtml/Recsins/Edit/Form.php +27 -65
  2. app/code/community/Brainsins/Recsins/Block/Recsins.php +15 -1
  3. app/code/community/Brainsins/Recsins/Model/Client.php +3 -1
  4. app/code/community/Brainsins/Recsins/Model/Mysql4/.DS_Store +0 -0
  5. app/code/community/Brainsins/Recsins/Model/Recsins.php +4 -4
  6. app/code/community/Brainsins/Recsins/controllers/Adminhtml/RecsinsController.php +18 -378
  7. app/code/community/Brainsins/Recsins/etc/config.xml +1 -1
  8. app/code/community/Brainsins/Recsins/sql/recsins_setup/mysql4-upgrade-1.5.2-1.5.3.php +1 -1
  9. app/code/community/Brainsins/Recsins/sql/recsins_setup/mysql4-upgrade-1.5.3-1.5.4.php +47 -0
  10. package.xml +6 -5
app/code/community/Brainsins/Recsins/Block/Adminhtml/Recsins/Edit/Form.php CHANGED
@@ -105,25 +105,7 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
105
  )
106
  );
107
 
108
- $uploading = Mage::getSingleton("core/session", array("name" => "adminhtml"))->getData('brainsins_UPLOADING_STATUS');
109
-
110
- if (isset($uploading) && $uploading == '1') {
111
-
112
- $continueUploadScript = "
113
- <script type='text/javascript'>
114
- try{
115
- var upload_catalog = document.getElementById('upload_catalog');
116
- var edit_form = document.getElementById('edit_form');
117
- if (upload_catalog.value != 'abort') {
118
- upload_catalog.value = 'uploading';
119
- }
120
- edit_form.submit();
121
- } catch (e){};
122
- </script>
123
- ";
124
-
125
- //$form->setExtraHtml($continueUploadScript);
126
- }
127
 
128
  $data = $this->getRequest()->getPost();
129
 
@@ -141,24 +123,6 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
141
  $js .= "import_config.value = '1';" . PHP_EOL;
142
  $js .= "edit_form.submit();" . PHP_EOL;
143
  $js .= "}" . PHP_EOL;
144
- $js .= "function bsUploadCatalog(){" . PHP_EOL;
145
- $js .= "var upload_catalog = document.getElementById('upload_catalog');" . PHP_EOL;
146
- $js .= "var edit_form = document.getElementById('edit_form');" . PHP_EOL;
147
- $js .= "upload_catalog.value = 'upload';" . PHP_EOL;
148
- $js .= "edit_form.submit();" . PHP_EOL;
149
- $js .= "}" . PHP_EOL;
150
- $js .= "function bsUploadingCatalog(){" . PHP_EOL;
151
- $js .= "var upload_catalog = document.getElementById('upload_catalog');" . PHP_EOL;
152
- $js .= "var edit_form = document.getElementById('edit_form');" . PHP_EOL;
153
- $js .= "upload_catalog.value = 'uploading';" . PHP_EOL;
154
- $js .= "edit_form.submit();" . PHP_EOL;
155
- $js .= "}" . PHP_EOL;
156
- $js .= "function bsAbortCatalogUpload(){" . PHP_EOL;
157
- $js .= "var upload_catalog = document.getElementById('upload_catalog');" . PHP_EOL;
158
- $js .= "var edit_form = document.getElementById('edit_form');" . PHP_EOL;
159
- $js .= "upload_catalog.value = 'abort';" . PHP_EOL;
160
- $js .= "edit_form.submit();" . PHP_EOL;
161
- $js .= "}" . PHP_EOL;
162
  $js.= "</script>" . PHP_EOL;
163
  echo($js);
164
 
@@ -274,7 +238,7 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
274
  $page = $entry['page'];
275
 
276
  $radio = new Varien_Data_Form_Element_Radio();
277
- $radioLink = "javascript:window.open(\"" . $linkBaseUrl . "/settings/editrecommenderstyle?idRecommender=" . $id . "\")";
278
  $radio->setLabel($name);
279
  $radio->setValue($id);
280
  $radio->setAdditional_text("<input type='button' onclick='" . $radioLink . "' value='" . $helper->__("Edit Style") . "' style='margin-left:20px'>");
@@ -389,10 +353,10 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
389
 
390
  $cautionText = "(" . $helper->__("please do not modify these values unless you are told so by BrainSINS' support team") . ")";
391
 
392
- $advancedFieldSet->addElement(new Varien_Data_Form_Element_Label(array('value' => $cautionText)));
393
- $advancedFieldSet->addElement(new Varien_Data_Form_Element_Label(array('value' => $helper->__("Catalog upload page size"), 'bold' => 'true')));
394
 
395
- $radio1 = new Varien_Data_Form_Element_Radio();
396
  $radio1->setLabel("1");
397
  $radio1->setValue("page1");
398
  $radio1->setAdditional_text("");
@@ -441,7 +405,7 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
441
  }
442
 
443
  $advancedRadios->setValue(array($pageSize));
444
-
445
  $includeOutOfStockLabel = new Varien_Data_Form_Element_Label(array('value' => $helper->__("Include out of stock products in catalog upload (out of stock products will be recommended)"), 'bold' => 'true'));
446
 
447
  $outOfStockCheckbox = new Varien_Data_Form_Element_Checkbox(array('name' => 'out_of_stock_checkbox'));
@@ -562,8 +526,22 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
562
  }
563
 
564
  $taxPriceRadios->setValue(array($taxPriceDisplayOption));
 
 
 
 
 
 
 
 
 
 
 
 
 
 
565
 
566
- $advancedFieldSet->addElement($advancedRadios);
567
  $advancedFieldSet->addElement($includeOutOfStockLabel);
568
  $advancedFieldSet->addElement($outOfStockCheckbox);
569
  $advancedFieldSet->addElement($imagesLabel);
@@ -574,6 +552,10 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
574
  $advancedFieldSet->addElement($specialPriceRadios);
575
  $advancedFieldSet->addElement($taxPriceLabel);
576
  $advancedFieldSet->addElement($taxPriceRadios);
 
 
 
 
577
 
578
  //$advancedFieldSet->addElement($imagesExplainLabel1);
579
  //$advancedFieldSet->addElement($imagesExplainLabel2);
@@ -583,37 +565,17 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
583
  $hiddenImport->setId("import_config");
584
  $hiddenImport->setValue("0");
585
 
586
- $hiddenUpload = new Varien_Data_Form_Element_Hidden(array('name' => 'upload_catalog'));
587
- $hiddenUpload->setId("upload_catalog");
588
- $hiddenUpload->setValue("0");
589
 
590
  $importButton = new Varien_Data_Form_Element_Button(array('name' => 'import_config_button'));
591
  $importButton->setId('import_config_button');
592
  $importButton->setValue($helper->__('Import Recommenders'));
593
  $importButton->setOnclick("bsImportConfig()");
594
 
595
- $uploadButton = new Varien_Data_Form_Element_Button(array('name' => 'upload_catalog_button'));
596
- $uploadButton->setId('upload_catalog_button');
597
- $uploadButton->setValue($helper->__('Send Catalog'));
598
- $uploadButton->setOnclick("bsUploadCatalog()");
599
-
600
- $abortButton = new Varien_Data_Form_Element_Button(array('name' => 'abort_upload_button'));
601
- $abortButton->setId('upload_catalog_button');
602
- $abortButton->setValue($helper->__('Abort Catalog Upload'));
603
- $abortButton->setOnclick("bsAbortCatalogUpload()");
604
-
605
- $abortButton2 = new Varien_Data_Form_Element_Button(array('name' => 'abort_upload_button2'));
606
- $abortButton2->setId('upload_catalog_button2');
607
- $abortButton2->setValue($helper->__('Abort Catalog Upload'));
608
- $abortButton2->setOnclick("bsAbortCatalogUpload()");
609
 
610
 
611
  // build the final form
612
 
613
- if (isset($uploading) && $uploading == '1') {
614
- $form->addElement($abortButton2);
615
- }
616
-
617
  $form->addElement($keyFieldSet);
618
  $form->addElement($enableFieldSet);
619
  $form->addElement($homeFieldSet);
@@ -636,4 +598,4 @@ class Brainsins_Recsins_Block_Adminhtml_Recsins_Edit_Form extends Mage_Adminhtml
636
  return $form;
637
  }
638
 
639
- }
105
  )
106
  );
107
 
108
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
109
 
110
  $data = $this->getRequest()->getPost();
111
 
123
  $js .= "import_config.value = '1';" . PHP_EOL;
124
  $js .= "edit_form.submit();" . PHP_EOL;
125
  $js .= "}" . PHP_EOL;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
126
  $js.= "</script>" . PHP_EOL;
127
  echo($js);
128
 
238
  $page = $entry['page'];
239
 
240
  $radio = new Varien_Data_Form_Element_Radio();
241
+ $radioLink = "javascript:window.open(\"" . $linkBaseUrl . "/optimization/editrecommenderstyle?idRecommender=" . $id . "\")";
242
  $radio->setLabel($name);
243
  $radio->setValue($id);
244
  $radio->setAdditional_text("<input type='button' onclick='" . $radioLink . "' value='" . $helper->__("Edit Style") . "' style='margin-left:20px'>");
353
 
354
  $cautionText = "(" . $helper->__("please do not modify these values unless you are told so by BrainSINS' support team") . ")";
355
 
356
+ //$advancedFieldSet->addElement(new Varien_Data_Form_Element_Label(array('value' => $cautionText)));
357
+ //$advancedFieldSet->addElement(new Varien_Data_Form_Element_Label(array('value' => $helper->__("Catalog upload page size"), 'bold' => 'true')));
358
 
359
+ /*$radio1 = new Varien_Data_Form_Element_Radio();
360
  $radio1->setLabel("1");
361
  $radio1->setValue("page1");
362
  $radio1->setAdditional_text("");
405
  }
406
 
407
  $advancedRadios->setValue(array($pageSize));
408
+ */
409
  $includeOutOfStockLabel = new Varien_Data_Form_Element_Label(array('value' => $helper->__("Include out of stock products in catalog upload (out of stock products will be recommended)"), 'bold' => 'true'));
410
 
411
  $outOfStockCheckbox = new Varien_Data_Form_Element_Checkbox(array('name' => 'out_of_stock_checkbox'));
526
  }
527
 
528
  $taxPriceRadios->setValue(array($taxPriceDisplayOption));
529
+
530
+
531
+ $importScriptLabel = new Varien_Data_Form_Element_Label(array('value' => $helper->__("Custom style script (HTTP)"), 'bold' => 'true'));
532
+ $scriptUrl = Mage::getStoreConfig('brainsins/BS_SCRIPT_URL');
533
+ $importScript = new Varien_Data_Form_Element_Text(array('name' => 'bs_script', 'style' => 'width:400px'));
534
+ $importScript->setId('bs_script');
535
+ $importScript->setValue($scriptUrl);
536
+
537
+ $importScriptHttpsLabel = new Varien_Data_Form_Element_Label(array('value' => $helper->__("Custom style script (HTTPS)"), 'bold' => 'true'));
538
+ $scriptHttpsUrl = Mage::getStoreConfig('brainsins/BS_SCRIPT_THTTPS_URL');
539
+ $importScriptHttps = new Varien_Data_Form_Element_Text(array('name' => 'bs_script_https', 'style' => 'width:400px'));
540
+ $importScriptHttps->setId('bs_script_https');
541
+ $importScriptHttps->setValue($scriptHttpsUrl);
542
+
543
 
544
+ //$advancedFieldSet->addElement($advancedRadios);
545
  $advancedFieldSet->addElement($includeOutOfStockLabel);
546
  $advancedFieldSet->addElement($outOfStockCheckbox);
547
  $advancedFieldSet->addElement($imagesLabel);
552
  $advancedFieldSet->addElement($specialPriceRadios);
553
  $advancedFieldSet->addElement($taxPriceLabel);
554
  $advancedFieldSet->addElement($taxPriceRadios);
555
+ $advancedFieldSet->addElement($importScriptLabel);
556
+ $advancedFieldSet->addElement($importScript);
557
+ $advancedFieldSet->addElement($importScriptHttpsLabel);
558
+ $advancedFieldSet->addElement($importScriptHttps);
559
 
560
  //$advancedFieldSet->addElement($imagesExplainLabel1);
561
  //$advancedFieldSet->addElement($imagesExplainLabel2);
565
  $hiddenImport->setId("import_config");
566
  $hiddenImport->setValue("0");
567
 
 
 
 
568
 
569
  $importButton = new Varien_Data_Form_Element_Button(array('name' => 'import_config_button'));
570
  $importButton->setId('import_config_button');
571
  $importButton->setValue($helper->__('Import Recommenders'));
572
  $importButton->setOnclick("bsImportConfig()");
573
 
574
+
 
 
 
 
 
 
 
 
 
 
 
 
 
575
 
576
 
577
  // build the final form
578
 
 
 
 
 
579
  $form->addElement($keyFieldSet);
580
  $form->addElement($enableFieldSet);
581
  $form->addElement($homeFieldSet);
598
  return $form;
599
  }
600
 
601
+ }
app/code/community/Brainsins/Recsins/Block/Recsins.php CHANGED
@@ -153,6 +153,20 @@ class Brainsins_Recsins_Block_Recsins extends Mage_Core_Block_Abstract {
153
  $script .= "</script>";
154
  $html .= $script;
155
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
156
 
157
  $html .= '<script type="text/javascript">';
158
  $html .= 'var bsHost = (("https:" == document.location.protocol) ? "https://" : "http://");' . PHP_EOL;
@@ -453,4 +467,4 @@ class Brainsins_Recsins_Block_Recsins extends Mage_Core_Block_Abstract {
453
  }
454
  return $script;
455
  }
456
- }
153
  $script .= "</script>";
154
  $html .= $script;
155
  }
156
+
157
+ //custom js file from config
158
+
159
+ $scriptUrl = "";
160
+
161
+ if (Mage::app()->getStore()->isCurrentlySecure()) {
162
+ $scriptUrl = Mage::getStoreConfig('brainsins/BS_SCRIPT_THTTPS_URL');
163
+ } else {
164
+ $scriptUrl = Mage::getStoreConfig('brainsins/BS_SCRIPT_URL');
165
+ }
166
+
167
+ if (isset($scriptUrl) && $scriptUrl != "") {
168
+ $html .= "<script type='text/javascript' src='" . $scriptUrl . "'></script>";
169
+ }
170
 
171
  $html .= '<script type="text/javascript">';
172
  $html .= 'var bsHost = (("https:" == document.location.protocol) ? "https://" : "http://");' . PHP_EOL;
467
  }
468
  return $script;
469
  }
470
+ }
app/code/community/Brainsins/Recsins/Model/Client.php CHANGED
@@ -468,6 +468,7 @@ class Brainsins_Recsins_Model_Client extends Mage_Core_Model_Abstract {
468
  curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-Type: application/xml", "Accept: application/xml"));
469
  curl_setopt($curl, CURLOPT_POST, 1);
470
  curl_setopt($curl, CURLOPT_POSTFIELDS, $text);
 
471
  $result = curl_exec($curl);
472
  curl_close($curl);
473
  return $this->checkResult($result);
@@ -544,6 +545,7 @@ class Brainsins_Recsins_Model_Client extends Mage_Core_Model_Abstract {
544
  curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-Type: application/xml", "Accept: application/xml"));
545
  curl_setopt($curl, CURLOPT_POST, 1);
546
  curl_setopt($curl, CURLOPT_POSTFIELDS, "");
 
547
  $result = curl_exec($curl);
548
  curl_close($curl);
549
  return $result;
@@ -587,4 +589,4 @@ class Brainsins_Recsins_Model_Client extends Mage_Core_Model_Abstract {
587
  return $this->checkResult($result);
588
  }
589
 
590
- }
468
  curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-Type: application/xml", "Accept: application/xml"));
469
  curl_setopt($curl, CURLOPT_POST, 1);
470
  curl_setopt($curl, CURLOPT_POSTFIELDS, $text);
471
+ curl_setopt($curl, CURLOPT_TIMEOUT, 1);
472
  $result = curl_exec($curl);
473
  curl_close($curl);
474
  return $this->checkResult($result);
545
  curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-Type: application/xml", "Accept: application/xml"));
546
  curl_setopt($curl, CURLOPT_POST, 1);
547
  curl_setopt($curl, CURLOPT_POSTFIELDS, "");
548
+ curl_setopt($curl, CURLOPT_TIMEOUT, 1);
549
  $result = curl_exec($curl);
550
  curl_close($curl);
551
  return $result;
589
  return $this->checkResult($result);
590
  }
591
 
592
+ }
app/code/community/Brainsins/Recsins/Model/Mysql4/.DS_Store ADDED
Binary file
app/code/community/Brainsins/Recsins/Model/Recsins.php CHANGED
@@ -496,7 +496,7 @@ class Brainsins_Recsins_Model_Recsins extends Mage_Core_Model_Abstract {
496
  }
497
 
498
  $qty = $item->getQty();
499
- $price = $item->getPrice();
500
 
501
 
502
  $product = $item->getProduct();
@@ -573,11 +573,11 @@ class Brainsins_Recsins_Model_Recsins extends Mage_Core_Model_Abstract {
573
  $firstElement = false;
574
  }
575
  $order = Mage::getModel('sales/order')->loadByIncrementId($id);
576
- $total += $order->getSubtotal();
577
  }
578
  } else {
579
  $idOrder = $order->getIncrementId();
580
- $total = $order->getSubtotal();
581
  //$total = $order->getBase_grand_total();
582
  }
583
 
@@ -648,4 +648,4 @@ public function checkNewUser($customer) {
648
  }
649
  }
650
 
651
- }
496
  }
497
 
498
  $qty = $item->getQty();
499
+ $price = $item->getBasePriceInclTax();
500
 
501
 
502
  $product = $item->getProduct();
573
  $firstElement = false;
574
  }
575
  $order = Mage::getModel('sales/order')->loadByIncrementId($id);
576
+ $total += $order->getBaseSubtotalInclTax();
577
  }
578
  } else {
579
  $idOrder = $order->getIncrementId();
580
+ $total = $order->getBaseSubtotalInclTax();
581
  //$total = $order->getBase_grand_total();
582
  }
583
 
648
  }
649
  }
650
 
651
+ }
app/code/community/Brainsins/Recsins/controllers/Adminhtml/RecsinsController.php CHANGED
@@ -25,13 +25,8 @@
25
  */
26
 
27
  function bsErrorHandler($errno, $errstr, $errfile, $errline) {
28
- Mage::getModel('recsins/recsins')->log($errno . " | " . $errstr . " | " . $errfile . " at line " . $errline);
29
- Mage::getModel('core/config')->saveConfig('brainsins/UPLOADING_STATUS', '0');
30
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
31
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_HAS_ERRORS', '1');
32
- Mage::getSingleton('adminhtml/session')->addError(Mage::helper('recsins')->__('Catalog upload aborted due to unexpected error<br>See [storeUrl]/erros/bsins/bsinslog for details'));
33
- Mage::getModel('core/config')->saveConfig('brainsins/LAST_PAGE_SENT', '0');
34
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
35
  return mageCoreErrorHandler($errno, $errstr, $errfile, $errline);
36
  }
37
 
@@ -191,32 +186,6 @@ class Brainsins_Recsins_Adminhtml_RecsinsController extends Mage_Adminhtml_Contr
191
  Mage::getModel('core/config')->saveConfig('brainsins/BS_CART_RECOMMENDER', $cartRecommender);
192
  }
193
 
194
- $pageSizeText = $data['bsadvanced'];
195
- $pageSize = 50;
196
-
197
- if (isset($pageSizeText) && $pageSizeText !== null) {
198
- Mage::getModel('core/config')->saveConfig('brainsins/BS_PAGE_SIZE', $pageSizeText);
199
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_BS_PAGE_SIZE', $pageSizeText);
200
- if ($pageSizeText == 'page1') {
201
- $pageSize = 1;
202
- }
203
- if ($pageSizeText == 'page10') {
204
- $pageSize = 10;
205
- }
206
- if ($pageSizeText == 'page20') {
207
- $pageSize = 20;
208
- }
209
- if ($pageSizeText == 'page50') {
210
- $pageSize = 50;
211
- }
212
- if ($pageSizeText == 'page100') {
213
- $pageSize = 100;
214
- }
215
- if ($pageSizeText == 'page200') {
216
- $pageSize = 200;
217
- }
218
- }
219
-
220
  $uploadOutOfStockProducts = false;
221
 
222
  if (array_key_exists("out_of_stock_checkbox", $data)) {
@@ -291,6 +260,20 @@ class Brainsins_Recsins_Adminhtml_RecsinsController extends Mage_Adminhtml_Contr
291
  }
292
  }
293
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
294
 
295
  $importConfig = $data['import_config'];
296
  if (isset($importConfig) && $importConfig == '1') {
@@ -304,33 +287,10 @@ class Brainsins_Recsins_Adminhtml_RecsinsController extends Mage_Adminhtml_Contr
304
  }
305
  $this->_redirect('*/*/');
306
  }
307
-
308
- /*$uploadCatalog = $data['upload_catalog'];
309
-
310
- if (isset($uploadCatalog) && $uploadCatalog == 'upload') {
311
- Mage::getModel('core/config')->saveConfig('brainsins/LAST_PAGE_SENT', '0');
312
- $this->uploadCatalog($pageSize);
313
- $this->_redirect('* / * / ');
314
- return;
315
- } else if (isset($uploadCatalog) && $uploadCatalog == 'uploading') {
316
- $this->uploadingCatalog($pageSize);
317
- $this->_redirect('* / * / ');
318
- return;
319
- } else if (isset($uploadCatalog) && $uploadCatalog == 'abort') {
320
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
321
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
322
- Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('recsins')->__('Catalog upload aborted'));
323
- $this->_redirect('* / * / ');
324
- return;
325
- } else {
326
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
327
- }*/
328
  }
329
  } catch (Exception $e) {
330
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
331
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_HAS_ERRORS', '1');
332
  Mage::getModel('recsins/recsins')->log($e);
333
- Mage::getSingleton('adminhtml/session')->addError(Mage::helper('recsins')->__('Catalog upload aborted due to unexpected exception<br>See [storeUrl]/erros/bsins/bsinslog for details'));
334
  }
335
 
336
  $this->_redirect('*/*/');
@@ -359,326 +319,6 @@ class Brainsins_Recsins_Adminhtml_RecsinsController extends Mage_Adminhtml_Contr
359
 
360
  }
361
 
362
- private function uploadCatalog($pageSize) {
363
-
364
- $this->_redirect('*/*/');
365
- return;
366
-
367
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '1');
368
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
369
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATE', 'CLIENTS');
370
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '1');
371
-
372
- $lastPageSent = Mage::getStoreConfig('brainsins/LAST_PAGE_SENT');
373
- $this->uploadingCatalog($pageSize, 'CLIENTS');
374
-
375
- return;
376
- }
377
-
378
- private function uploadingCatalog($pageSize, $state = null) {
379
-
380
- $this->_redirect('*/*/');
381
- return;
382
-
383
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
384
- $recsins = Mage::getSingleton('recsins/recsins');
385
- $lastPageSent = Mage::getSingleton("core/session", array("name" => "adminhtml"))->getData('brainsins_LAST_PAGE_SENT');
386
-
387
- if (!isset($state) || $state == null) {
388
- $state = Mage::getSingleton("core/session", array("name" => "adminhtml"))->getData('brainsins_UPLOADING_STATE');
389
- }
390
-
391
- $firstTransaction = Mage::getSingleton("core/session", array("name" => "adminhtml"))->getData('brainsins_FIRST_TRANSACTION');
392
- if (isset($firstTransaction)) {
393
- $firstTransaction = isset($firstTransaction) && $firstTransaction == '1';
394
- } else {
395
- $firstTransaction = false;
396
- }
397
-
398
- /*$isFirstUpload = Mage::getStoreConfig('brainsins/BS_FIRST_CATALOG_UPLOAD');
399
- if (isset($isFirstUpload)) {
400
- $isFirstUpload = $isFirstUpload == '1';
401
- } else {
402
- $isFirstUpload = true;
403
- }
404
-
405
- $lastFakeId = 0;
406
-
407
- $isFirstUpload = true;
408
-
409
- if ($isFirstUpload === true) {
410
- $lastFakeId = Mage::getStoreConfig('brainsins/BS_LAST_FAKE_ID');
411
- if (!isset($lastFakeId)) {
412
- $lastFakeId = 0;
413
- } else {
414
-
415
- }
416
- }*/
417
-
418
-
419
- if ($state === 'CLIENTS') {
420
-
421
- $numItems = Mage::getModel('customer/customer')->getCollection()->count();
422
- $res = $recsins->uploadCatalogUsers($pageSize, $lastPageSent, $firstTransaction);
423
- //$lastPageSent = Mage::getSingleton("core/session", array("name" => "adminhtml"))->getData('brainsins_LAST_PAGE_SENT');
424
-
425
-
426
- $hasErrors = Mage::getSingleton("core/session", array("name" => "adminhtml"))->getData('brainsins_UPLOADING_HAS_ERRORS');
427
- if (isset($hasErrors) && $hasErrors == "1") {
428
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_HAS_ERRORS', '0');
429
- return;
430
- }
431
-
432
-
433
- $continue = isset($res) && $res === true && $lastPageSent * $pageSize < $numItems;
434
-
435
- if (!isset($res) || $res === false) {
436
- $message = $this->getDisplayMessage('CLIENTS', 'ERROR');
437
- Mage::getSingleton('adminhtml/session')->addError($message);
438
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
439
- } else if ($continue === true) {
440
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '1');
441
- $percentage = number_format(($lastPageSent * $pageSize * 100) / $numItems, 1);
442
- $message = $this->getDisplayMessage('CLIENTS', 'UPLOADING', $percentage);
443
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
444
- /*if ($isFirstUpload) {
445
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '0');
446
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_BS_LAST_FAKE_ID', '0');
447
- }*/
448
- } else {
449
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '1');
450
- $message = $this->getDisplayMessage('CLIENTS', 'FINISHED');
451
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
452
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATE', 'PRODUCTS');
453
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
454
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '1');
455
- }
456
-
457
- return;
458
- } else if ($state === 'PRODUCTS') {
459
-
460
- $uploadOutOfStockValue = Mage::getStoreConfig('brainsins/BS_SEND_OUT_OF_STOCK_PRODUCTS');
461
- $uploadOutOfStock = false;
462
- if (isset($uploadOutOfStockValue) && $uploadOutOfStockValue == '1') {
463
- $uploadOutOfStock = true;
464
- }
465
-
466
- $numItems = Mage::getModel('catalog/product')->getCollection()->count();
467
- $res = $recsins->uploadCatalogProducts($pageSize, $lastPageSent, $firstTransaction, $uploadOutOfStock);
468
- //$lastPageSent = Mage::getStoreConfig('brainsins/LAST_PAGE_SENT');
469
-
470
- $hasErrors = Mage::getSingleton("core/session", array("name" => "adminhtml"))->getData('brainsins_UPLOADING_HAS_ERRORS');
471
- if (isset($hasErrors) && $hasErrors == "1") {
472
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_HAS_ERRORS', '0');
473
- return;
474
- }
475
-
476
-
477
- $continue = isset($res) && $res === true && $lastPageSent * $pageSize < $numItems;
478
-
479
- if (!isset($res) || $res === false) {
480
- $message = $this->getDisplayMessage('PRODUCTS', 'ERROR');
481
- Mage::getSingleton('adminhtml/session')->addError($message);
482
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
483
- } else if ($continue === true) {
484
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '1');
485
- $percentage = number_format(($lastPageSent * $pageSize * 100) / $numItems, 1);
486
- $message = $this->getDisplayMessage('PRODUCTS', 'UPLOADING', $percentage);
487
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
488
- //first transacion is changed inside the recsins model only if at least a product is processed
489
- } else {
490
- $message = $this->getDisplayMessage('PRODUCTS', 'FINISHED');
491
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
492
-
493
- // upload products is always the last step
494
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
495
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
496
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '1');
497
- //previous code considereing carts upload in first upload
498
- /*if ($isFirstUpload === true) {
499
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '1');
500
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
501
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATE', 'QUOTES');
502
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '1');
503
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_BS_LAST_FAKE_ID', '0');
504
- } else {
505
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
506
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
507
- }*/
508
- }
509
- return;
510
- } else {
511
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
512
- }
513
-
514
-
515
- /*else if ($state === 'QUOTES' && $isFirstUpload === true) {
516
- $numItems = Mage::getModel('sales/quote')->getCollection()->count();
517
- $res = $recsins->uploadCatalogQuotes($pageSize, $lastPageSent, $lastFakeId, $firstTransaction);
518
- //$lastPageSent = Mage::getStoreConfig('brainsins/LAST_PAGE_SENT');
519
- $continue = isset($res) && $res === true && $lastPageSent * $pageSize < $numItems;
520
-
521
- if (!isset($res) || $res === false) {
522
- $message = $this->getDisplayMessage('QUOTES', 'ERROR');
523
- Mage::getSingleton('adminhtml/session')->addError($message);
524
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
525
- } else if ($continue === true) {
526
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '1');
527
- $percentage = number_format(($lastPageSent * $pageSize * 100) / $numItems, 1);
528
- $message = $this->getDisplayMessage('QUOTES', 'UPLOADING', $percentage);
529
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
530
- if ($isFirstUpload) {
531
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '0');
532
- }
533
- } else {
534
- $message = $this->getDisplayMessage('QUOTES', 'FINISHED');
535
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
536
-
537
- // quotes is now the last step
538
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATE', 'QUOTES');
539
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
540
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '1');
541
- //Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_BS_FIRST_CATALOG_UPLOAD', "0");
542
- Mage::getModel('core/config')->saveConfig('brainsins/BS_FIRST_CATALOG_UPLOAD', "0");
543
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
544
- // ---
545
- //Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins/UPLOADING_STATE', 'ORDERS');
546
- //Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins/LAST_PAGE_SENT', '0');
547
- //Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins/FIRST_TRANSACTION', '1');
548
- }
549
- return;
550
- } else if ($state === 'ORDERS' && $isFirstUpload === true) {
551
-
552
- // orders are not been uploaded for the moment
553
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATE', 'QUOTES');
554
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
555
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '1');
556
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
557
- return;
558
- // ---
559
-
560
- $numItems = Mage::getModel('sales/order')->getCollection()->count();
561
- $res = $recsins->uploadCatalogOrders($pageSize, $lastPageSent, $lastFakeId, $firstTransaction);
562
- $lastPageSent = Mage::getStoreConfig('brainsins/LAST_PAGE_SENT');
563
- $continue = isset($res) && $res === true && $lastPageSent * $pageSize < $numItems;
564
-
565
- if (!isset($res) || $res === false) {
566
- $message = $this->getDisplayMessage('ORDERS', 'ERROR');
567
- Mage::getSingleton('adminhtml/session')->addError($message);
568
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
569
- } else if ($continue === true) {
570
- $percentage = number_format(($lastPageSent * $pageSize * 100) / $numItems, 1);
571
- $message = $this->getDisplayMessage('ORDERS', 'UPLOADING', $percentage);
572
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
573
- if ($isFirstUpload) {
574
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '0');
575
- }
576
- } else {
577
- $message = $this->getDisplayMessage('ORDERS', 'FINISHED');
578
- Mage::getSingleton('adminhtml/session')->addSuccess($message);
579
-
580
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATE', 'ORDERS');
581
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_LAST_PAGE_SENT', '0');
582
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_FIRST_TRANSACTION', '1');
583
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_BS_FIRST_CATALOG_UPLOAD', "0");
584
- Mage::getSingleton("core/session", array("name" => "adminhtml"))->setData('brainsins_UPLOADING_STATUS', '0');
585
- }
586
- return;
587
- }*/
588
-
589
-
590
-
591
- return;
592
- }
593
-
594
- private function getDisplayMessage($state, $status, $progress = null) {
595
-
596
- $message = "";
597
-
598
- //$isFirstUpload = Mage::getStoreConfig('brainsins/BS_FIRST_CATALOG_UPLOAD');
599
- $numStages = 2;
600
-
601
- /*if (isset($isFirstUpload)) {
602
- $isFirstUpload = $isFirstUpload == '1';
603
- } else {
604
- $isFirstUpload = true;
605
- }*/
606
-
607
- /*if ($isFirstUpload) {
608
-
609
- //orders are not been uploaded
610
- $numStages = 3;
611
- //$numStages = 4;
612
- }*/
613
-
614
- if ($state == 'CLIENTS') {
615
- if ($status == 'UPLOADING') {
616
- $message .= "(1/$numStages) " . Mage::helper('recsins')->__("Uploading Clients") . " : $progress %<br>";
617
- } else if ($status == 'FINISHED') {
618
- $message .= "(1/$numStages) " . Mage::helper('recsins')->__("Clients uploaded OK") . "<br>";
619
- $message .= "(2/$numStages) " . Mage::helper('recsins')->__("Uploading Products") . " : 0.0 %<br>";
620
- } else if ($status == 'ERROR') {
621
- $message .= Mage::helper('recsins')->__("Error occurred while uploading Clients") . "<br>";
622
- $message .= Mage::helper('recsins')->__("Catalog upload aborted") . "<br>";
623
- }
624
- return $message;
625
- } else {
626
- $message .= "(1/$numStages) " . Mage::helper('recsins')->__("Clients uploaded OK") . "<br>";
627
- }
628
-
629
- if ($state == 'PRODUCTS') {
630
- if ($status == 'UPLOADING') {
631
- $message .= "(2/$numStages) " . Mage::helper('recsins')->__("Uploading Products") . " : $progress %<br>";
632
- } else if ($status == 'FINISHED') {
633
- $message .= "(2/$numStages) " . Mage::helper('recsins')->__("Products uploaded OK") . "<br>";
634
- /*if ($isFirstUpload === true) {
635
- $message .= "(3/$numStages) " . Mage::helper('recsins')->__("Uploading Carts") . " : 0.0 %<br>";
636
- }*/
637
- } else if ($status == 'ERROR') {
638
- $message .= Mage::helper('recsins')->__("Error occurred while uploading Products") . "<br>";
639
- $message .= Mage::helper('recsins')->__("Catalog upload aborted") . "<br>";
640
- }
641
- return $message;
642
- } else {
643
- $message .= "(2/$numStages) " . Mage::helper('recsins')->__("Products uploaded OK") . "<br>";
644
- }
645
-
646
- /* if ($isFirstUpload === true) {
647
-
648
- if ($state == 'QUOTES') {
649
- if ($status == 'UPLOADING') {
650
- $message .= "(3/$numStages) " . Mage::helper('recsins')->__("Uploading Carts") . " : $progress %<br>";
651
- } else if ($status == 'FINISHED') {
652
- $message .= "(3/$numStages) " . Mage::helper('recsins')->__("Carts uploaded OK") . "<br>";
653
- //orders are not been uploaded
654
- //$message .= "(4/$numStages) " . Mage::helper('recsins')->__("Uploading Purchases") . " : 0.0 %<br>";
655
- } else if ($status == 'ERROR') {
656
- $message .= Mage::helper('recsins')->__("Error occurred while uploading Carts") . "<br>";
657
- $message .= Mage::helper('recsins')->__("Catalog upload aborted") . "<br>";
658
- }
659
- return $message;
660
- } else {
661
- $message .= "(3/$numStages) " . Mage::helper('recsins')->__("Carts uploaded OK") . "<br>";
662
- }
663
-
664
- if ($state == 'ORDERS') {
665
- if ($status == 'UPLOADING') {
666
- $message .= "(4/$numStages) " . Mage::helper('recsins')->__("Uploading Purchases") . " : $progress %<br>";
667
- } else if ($status == 'FINISHED') {
668
- $message .= "(4/$numStages) " . Mage::helper('recsins')->__("Purchases uploaded OK") . "<br>";
669
- } else if ($status == 'ERROR') {
670
- $message .= Mage::helper('recsins')->__("Error occurred while uploading Purchases") . "<br>";
671
- $message .= Mage::helper('recsins')->__("Catalog upload aborted") . "<br>";
672
- }
673
- return $message;
674
- } else {
675
- $message .= "(4/$numStages) " . Mage::helper('recsins')->__("Purchases uploaded OK") . "<br>";
676
- }
677
- }*/
678
-
679
- return $message;
680
- }
681
-
682
  protected function _sendUploadResponse($fileName, $content, $contentType='application/octet-stream') {
683
  $response = $this->getResponse();
684
  $response->setHeader('HTTP/1.1 200 OK', '');
@@ -694,4 +334,4 @@ class Brainsins_Recsins_Adminhtml_RecsinsController extends Mage_Adminhtml_Contr
694
  die;
695
  }
696
 
697
- }
25
  */
26
 
27
  function bsErrorHandler($errno, $errstr, $errfile, $errline) {
28
+ //Mage::getModel('recsins/recsins')->log($errno . " | " . $errstr . " | " . $errfile . " at line " . $errline);
29
+ Mage::getSingleton('adminhtml/session')->addError(Mage::helper('recsins')->__('Error. Please try again'));
 
 
 
 
 
30
  return mageCoreErrorHandler($errno, $errstr, $errfile, $errline);
31
  }
32
 
186
  Mage::getModel('core/config')->saveConfig('brainsins/BS_CART_RECOMMENDER', $cartRecommender);
187
  }
188
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
189
  $uploadOutOfStockProducts = false;
190
 
191
  if (array_key_exists("out_of_stock_checkbox", $data)) {
260
  }
261
  }
262
  }
263
+
264
+ if (array_key_exists("bs_script", $data)) {
265
+ $bsScript = $data['bs_script'];
266
+ if (isset($bsScript)) {
267
+ Mage::getModel('core/config')->saveConfig('brainsins/BS_SCRIPT_URL', $bsScript);
268
+ }
269
+ }
270
+
271
+ if (array_key_exists("bs_script_https", $data)) {
272
+ $bsScriptHttps = $data['bs_script_https'];
273
+ if (isset($bsScriptHttps)) {
274
+ Mage::getModel('core/config')->saveConfig('brainsins/BS_SCRIPT_THTTPS_URL', $bsScriptHttps);
275
+ }
276
+ }
277
 
278
  $importConfig = $data['import_config'];
279
  if (isset($importConfig) && $importConfig == '1') {
287
  }
288
  $this->_redirect('*/*/');
289
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
290
  }
291
  } catch (Exception $e) {
 
 
292
  Mage::getModel('recsins/recsins')->log($e);
293
+ Mage::getSingleton('adminhtml/session')->addError(Mage::helper('recsins')->__('Error. Please try again'));
294
  }
295
 
296
  $this->_redirect('*/*/');
319
 
320
  }
321
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
322
  protected function _sendUploadResponse($fileName, $content, $contentType='application/octet-stream') {
323
  $response = $this->getResponse();
324
  $response->setHeader('HTTP/1.1 200 OK', '');
334
  die;
335
  }
336
 
337
+ }
app/code/community/Brainsins/Recsins/etc/config.xml CHANGED
@@ -26,7 +26,7 @@
26
  <config>
27
  <modules>
28
  <Brainsins_Recsins>
29
- <version>1.5.3</version>
30
  </Brainsins_Recsins>
31
  </modules>
32
  <frontend>
26
  <config>
27
  <modules>
28
  <Brainsins_Recsins>
29
+ <version>1.5.4</version>
30
  </Brainsins_Recsins>
31
  </modules>
32
  <frontend>
app/code/community/Brainsins/Recsins/sql/recsins_setup/mysql4-upgrade-1.5.2-1.5.3.php CHANGED
@@ -40,7 +40,7 @@ if (!$installer->tableExists($table)) {
40
  ");
41
  }
42
 
43
- Mage::getModel('core/config')->saveConfig('brainsins/BS_VERSION', '1.5.2');
44
 
45
  $installer->endSetup();
46
 
40
  ");
41
  }
42
 
43
+ Mage::getModel('core/config')->saveConfig('brainsins/BS_VERSION', '1.5.3');
44
 
45
  $installer->endSetup();
46
 
app/code/community/Brainsins/Recsins/sql/recsins_setup/mysql4-upgrade-1.5.3-1.5.4.php ADDED
@@ -0,0 +1,47 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /*
4
+ * BrainSINS' Magento Extension allows to integrate the BrainSINS
5
+ * personalized product recommendations into a Magento Store.
6
+ * Copyright (c) 2011 Social Gaming Platform S.R.L.
7
+ *
8
+ * This file is part of BrainSINS' Magento Extension.
9
+ *
10
+ * BrainSINS' Magento Extension is free software: you can redistribute it
11
+ * and/or modify it under the terms of the GNU General Public License
12
+ * as published by the Free Software Foundation, either version 3 of the
13
+ * License, or (at your option) any later version.
14
+ *
15
+ * Foobar is distributed in the hope that it will be useful,
16
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18
+ * GNU General Public License for more details.
19
+ *
20
+ * You should have received a copy of the GNU General Public License
21
+ * along with Foobar. If not, see <http://www.gnu.org/licenses/>.
22
+ *
23
+ * Please do not hesitate to contact us at info@brainsins.com
24
+ *
25
+ */
26
+ $installer = $this;
27
+
28
+ $table = $installer->getTable('recsins_recommender');
29
+
30
+ $installer->startSetup();
31
+
32
+ if (!$installer->tableExists($table)) {
33
+ $installer->run("
34
+ CREATE TABLE IF NOT EXISTS {$table} (
35
+ `id` int(10) unsigned NOT NULL,
36
+ `name` varchar(255),
37
+ `page` smallint(8),
38
+ PRIMARY KEY (`id`)
39
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Brainsins loaded Recommenders';
40
+ ");
41
+ }
42
+
43
+ Mage::getModel('core/config')->saveConfig('brainsins/BS_VERSION', '1.5.4');
44
+
45
+ $installer->endSetup();
46
+
47
+ Mage::getConfig()->cleanCache();
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Brainsins_Recommender</name>
4
- <version>1.5.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.brainsins.es/contrato-de-prestacion-de-servicios-brainsin-para-plugins/">GPL 3.0</license>
7
  <channel>community</channel>
@@ -19,11 +19,12 @@ BrainSINS Recommender is offered as a software as a service. It processes the us
19
  Increase your cross-sell, up-sell and Average Order Value (AOV) rates. Send personalized emails to your clients to increase the return to your store, and measure and control the effect of all the recommendations in your online store.&#xD;
20
  &#xD;
21
  Install the plugin in a few minutes and offer more than 100 personalized recommenders in any web page of your online store in less than 24 hours. Choose the plan that better fits to your store at http://www.brainsins.es/tarifas/ and try it for Free 1 month, experimenting the benefits in your own online store without compromise.</description>
22
- <notes>Fixed currency display bug</notes>
 
23
  <authors><author><name>BrainSINS</name><user>auto-converted</user><email>alejandro.cuevas@brainsins.com</email></author></authors>
24
- <date>2012-06-19</date>
25
- <time>18:09:14</time>
26
- <contents><target name="magecommunity"><dir name="Brainsins"><dir name="Recsins"><dir name="Block"><dir name="Adminhtml"><dir name="Recsins"><dir name="Edit"><dir name="Tab"><file name="Form.php" hash="f50e327073f6db6f0b7aaf2e6018834b"/><file name=".DS_Store" hash="47ab7c6331c785f3abe32e1d49659743"/></dir><file name="Form.php" hash="a756ab6cd49dbab82e1b5f3c28fcacdd"/><file name="Tabs.php" hash="da7477ceefd6cc473fb2fb2a307f0282"/><file name=".DS_Store" hash="dbfd4b859fae44d226584cc0de499414"/></dir><file name="Edit.php" hash="942d16b49fca2566799c7c393ffdd4d2"/><file name="Grid.php" hash="bf34a0c320aeebfe1cc645dc4120b4aa"/><file name=".DS_Store" hash="550ce861437446e70bb1b83296032d36"/></dir><file name="Recsins.php" hash="f0bb580c8238818273726847917789f8"/><file name=".DS_Store" hash="1b0ef8c354534e8683bfa107de6b5724"/></dir><file name="Category.php" hash="fa64d544ad0020dfa651b6c27f95d734"/><file name="Checkout.php" hash="e6e523a465b52ff1d93dea497c15db5e"/><file name="Home.php" hash="26eb9d8e4f796bb0a2ba8ea90691c943"/><file name="Product.php" hash="648d439dc8729a8205449c6887175371"/><file name="Recsins.php" hash="01a190d055344f925871b938776413f9"/><file name=".DS_Store" hash="685d9658140adde8787312ba21575a63"/><file name=".LCKRecsins.php~" hash="ed46e9b84acaa2b3b33539877109417b"/></dir><dir name="Entity"><file name="Setup.php" hash="02af74b02e083c4552762ecc9987a1a7"/><file name=".DS_Store" hash="904a17b2e133ff00bc1c75992115b463"/></dir><dir name="Helper"><file name="Data.php" hash="c117b4e42fef671651a78c8f4e01d0e5"/><file name="Recsins.php" hash="435d1402b9b860d906db3a3beb3c93de"/><file name=".DS_Store" hash="c9075ec8f3a93c790032a41253f0410d"/></dir><dir name="Model"><dir name="Api"><dir name="ficheros"><file name="Api.php" hash="1ee860dbae5f6b13258a0d0645d5adf8"/><file name="ProductsApi.php" hash="935bed7774eabfeda9949810faa116b0"/><file name=".DS_Store" hash="014af3b68e1d3b96ec61219fe428ff22"/></dir><file name="Api.php" hash="0fbdc82b29aaa90ecf3a4c0da9b15e7d"/><file name="ProductsApi.php" hash="0af71e0b0a1f3b1884428a5e43dea402"/><file name="ficheros.zip" hash="aa99d1feccadf91c4e467075feb1a875"/><file name=".DS_Store" hash="ef6c115a2d11276a7d6f63bf02593722"/></dir><dir name="Mysql4"><dir name="Recsins"><file name="Collection.php" hash="8c69337dee2f64516174e59805c6ec83"/></dir><file name="Recsins.php" hash="57256b85a9e1279e0875ea50cf8325d4"/></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><dir name="Recommender"><file name="Collection.php" hash="6c36324bb84cba28f6a5bdb7eb0c2bce"/></dir><file name="Recommender.php" hash="f6857e56874c6480447b5c411aa7a066"/></dir></dir><file name="Setup.php" hash="02af74b02e083c4552762ecc9987a1a7"/></dir><file name="Cart.php" hash="d19925676d18f200f25b1c995f035300"/><file name="CartProduct.php" hash="fffddbe0a759335f89bbdbcec7b4d2eb"/><file name="Client.php" hash="29409d73f52481b78d68d2ad5b00998a"/><file name="NewFile.xml" hash="93286b7fccf6f6092628ada8b85c0727"/><file name="Observer.php" hash="6c0ff3f353947cda424057117c5ba530"/><file name="Order.php" hash="b8dcb3adfe676725fe4f09acff84cd97"/><file name="OrderProduct.php" hash="1d33e879db0bb8557704ed3b66fb584d"/><file name="Product.php" hash="222db5151109eb9e6741cc1fe0d1ba7f"/><file name="Recommender.php" hash="12532b4efd6fdec560522a2ecf029ed9"/><file name="Recsins.php" hash="4d9b501cd6f3d4d454072f92e295b243"/><file name="Recsins_1.php" hash="310a9b224478749d35c5b59689ce1a07"/><file name="Status.php" hash="e3f1a39141d7a4aaa99252937f60ca8d"/><file name="User.php" hash="3244421d7331e5167e910f6fc3827361"/><file name=".DS_Store" hash="1f13e526a6f8ed14ac43ebd700cb6f60"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="RecsinsController.php" hash="1c300e7678664231438a647ec30551db"/><file name=".DS_Store" hash="eb69d7bfb18ebe8966b63ac54b04d1c0"/></dir><file name="IndexController.php" hash="2c9f228ed4e43c347235ed327365a219"/><file name=".DS_Store" hash="b415ad11c2cfebb78e16adb17ca06bff"/></dir><dir name="etc"><file name="api.xml" hash="c82c8df487ba808a8851ea9f1a8fe197"/><file name="config.xml" hash="f0630b00e5cbe7ab3514a56900bb3481"/><file name="widget.xml" hash="c4f1829fa161f1119d817b64878f3b2f"/><file name=".DS_Store" hash="05e296fc2705958a70855fe260ceb9e5"/></dir><dir name="sql"><dir name="recsins_setup"><file name="mysql4-install-1.4.0.php" hash="33ae9091e3066779c13e738beae3650c"/><file name="mysql4-upgrade-1.4.0-1.4.1.php" hash="b636f16be2575bff013c14c012b34625"/><file name="mysql4-upgrade-1.4.1-1.4.2.php" hash="e73c5189c851c1ddb94d8ce8acd6f1a6"/><file name="mysql4-upgrade-1.4.2-1.4.3.php" hash="2297a4e5670b28a24c1fcd3d5d47aca6"/><file name="mysql4-upgrade-1.4.3-1.4.4.php" hash="6c76f6d7ffe9da72ebabd44779d13bde"/><file name="mysql4-upgrade-1.4.4-1.4.5.php" hash="1b932c2afb4543c6e067a7b769d48eb8"/><file name="mysql4-upgrade-1.4.5-1.4.6.php" hash="a851ccc0fa73440b74828c0b2ee993d9"/><file name="mysql4-upgrade-1.4.6-1.4.7.php" hash="923d491257ad9836738c1586d494e12c"/><file name="mysql4-upgrade-1.4.7-1.4.8.php" hash="a2c96553909227f5f5bd7a685691c0ac"/><file name="mysql4-upgrade-1.4.8-1.4.9.php" hash="86b6da79f302790ecb6a072c4ef68fb0"/><file name="mysql4-upgrade-1.4.9-1.5.0.php" hash="b10dd9d0dc951f3b783da743558af5ca"/><file name="mysql4-upgrade-1.5.0-1.5.1.php" hash="7f86ed73d2d35dd2989528046772fa8b"/><file name="mysql4-upgrade-1.5.1-1.5.2.php" hash="da8251355aa4811a099e5b22c9debca3"/><file name="mysql4-upgrade-1.5.2-1.5.3.php" hash="da8251355aa4811a099e5b22c9debca3"/><file name=".DS_Store" hash="70fb1641ce88fc5fdb410744cb098089"/></dir><file name=".DS_Store" hash="fd4b270e5bdf8c2dbe56c9a98d4e6548"/></dir><file name="COPYING.txt" hash="4fe869ee987a340198fb0d54c55c47f1"/><file name=".DS_Store" hash="5fbb75ac088ce79fe0044c4951680ae6"/></dir><file name=".DS_Store" hash="6404be841b797bdacec75c7f7bb4a79c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="recsins.xml" hash="c2608f0c7f9f6efcbeb74bd5b1427206"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="recsins"><file name="cart.phtml" hash="04ee1833a0177a83644e4d1f3211c789"/><file name="category.phtml" hash="1979377cb8f06740a6b44a922e46dacd"/><file name="product.phtml" hash="3a623d6b48cceae14912b4daf5113ca2"/><file name="recsins.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name=".DS_Store" hash="f0948e76df06a209a9b7f51ff398fd60"/></dir></dir><dir name="layout"><file name="recsins.xml" hash="9185dc1897ec93c400edd2cd95b6533d"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Brainsins_Recsins.xml" hash="54e1c94137477548911c4ebce7eb97fe"/></dir></target><target name="magelocale"><dir name="es_ES"><file name="Brainsins_Recsins.csv" hash="7f731ae9e9faa8b003a63722ef3ce18a"/></dir><dir name="en_US"><file name="Brainsins_Recsins.csv" hash="6381582be5edc31cba54a052bb48b86d"/></dir></target></contents>
27
  <compatible/>
28
  <dependencies/>
29
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Brainsins_Recommender</name>
4
+ <version>1.5.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.brainsins.es/contrato-de-prestacion-de-servicios-brainsin-para-plugins/">GPL 3.0</license>
7
  <channel>community</channel>
19
  Increase your cross-sell, up-sell and Average Order Value (AOV) rates. Send personalized emails to your clients to increase the return to your store, and measure and control the effect of all the recommendations in your online store.&#xD;
20
  &#xD;
21
  Install the plugin in a few minutes and offer more than 100 personalized recommenders in any web page of your online store in less than 24 hours. Choose the plan that better fits to your store at http://www.brainsins.es/tarifas/ and try it for Free 1 month, experimenting the benefits in your own online store without compromise.</description>
22
+ <notes>Unified price tracking&#xD;
23
+ Added an option to import custom styling script</notes>
24
  <authors><author><name>BrainSINS</name><user>auto-converted</user><email>alejandro.cuevas@brainsins.com</email></author></authors>
25
+ <date>2012-07-26</date>
26
+ <time>12:44:04</time>
27
+ <contents><target name="magecommunity"><dir name="Brainsins"><dir name="Recsins"><dir name="Block"><dir name="Adminhtml"><dir name="Recsins"><dir name="Edit"><dir name="Tab"><file name="Form.php" hash="f50e327073f6db6f0b7aaf2e6018834b"/><file name=".DS_Store" hash="47ab7c6331c785f3abe32e1d49659743"/></dir><file name="Form.php" hash="a9e1f799440e9ef7d6a731fbe0f50eca"/><file name="Tabs.php" hash="da7477ceefd6cc473fb2fb2a307f0282"/><file name=".DS_Store" hash="dbfd4b859fae44d226584cc0de499414"/></dir><file name="Edit.php" hash="942d16b49fca2566799c7c393ffdd4d2"/><file name="Grid.php" hash="bf34a0c320aeebfe1cc645dc4120b4aa"/><file name=".DS_Store" hash="550ce861437446e70bb1b83296032d36"/></dir><file name="Recsins.php" hash="f0bb580c8238818273726847917789f8"/><file name=".DS_Store" hash="1b0ef8c354534e8683bfa107de6b5724"/></dir><file name="Category.php" hash="fa64d544ad0020dfa651b6c27f95d734"/><file name="Checkout.php" hash="e6e523a465b52ff1d93dea497c15db5e"/><file name="Home.php" hash="26eb9d8e4f796bb0a2ba8ea90691c943"/><file name="Product.php" hash="648d439dc8729a8205449c6887175371"/><file name="Recsins.php" hash="c2bbcd8b3894963ca0b9a9eb4b7891c7"/><file name=".DS_Store" hash="685d9658140adde8787312ba21575a63"/><file name=".LCKRecsins.php~" hash="ed46e9b84acaa2b3b33539877109417b"/></dir><dir name="Entity"><file name="Setup.php" hash="02af74b02e083c4552762ecc9987a1a7"/><file name=".DS_Store" hash="904a17b2e133ff00bc1c75992115b463"/></dir><dir name="Helper"><file name="Data.php" hash="c117b4e42fef671651a78c8f4e01d0e5"/><file name="Recsins.php" hash="435d1402b9b860d906db3a3beb3c93de"/><file name=".DS_Store" hash="c9075ec8f3a93c790032a41253f0410d"/></dir><dir name="Model"><dir name="Api"><dir name="ficheros"><file name="Api.php" hash="1ee860dbae5f6b13258a0d0645d5adf8"/><file name="ProductsApi.php" hash="935bed7774eabfeda9949810faa116b0"/><file name=".DS_Store" hash="014af3b68e1d3b96ec61219fe428ff22"/></dir><file name="Api.php" hash="0fbdc82b29aaa90ecf3a4c0da9b15e7d"/><file name="ProductsApi.php" hash="0af71e0b0a1f3b1884428a5e43dea402"/><file name="ficheros.zip" hash="aa99d1feccadf91c4e467075feb1a875"/><file name=".DS_Store" hash="ef6c115a2d11276a7d6f63bf02593722"/></dir><dir name="Mysql4"><dir name="Recsins"><file name="Collection.php" hash="8c69337dee2f64516174e59805c6ec83"/></dir><file name="Recsins.php" hash="57256b85a9e1279e0875ea50cf8325d4"/><file name=".DS_Store" hash="738094d269ed6a646832036c60e08599"/></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><dir name="Recommender"><file name="Collection.php" hash="6c36324bb84cba28f6a5bdb7eb0c2bce"/></dir><file name="Recommender.php" hash="f6857e56874c6480447b5c411aa7a066"/></dir></dir><file name="Setup.php" hash="02af74b02e083c4552762ecc9987a1a7"/></dir><file name="Cart.php" hash="d19925676d18f200f25b1c995f035300"/><file name="CartProduct.php" hash="fffddbe0a759335f89bbdbcec7b4d2eb"/><file name="Client.php" hash="54ab4289c332f4414761ba4256dc205e"/><file name="NewFile.xml" hash="93286b7fccf6f6092628ada8b85c0727"/><file name="Observer.php" hash="6c0ff3f353947cda424057117c5ba530"/><file name="Order.php" hash="b8dcb3adfe676725fe4f09acff84cd97"/><file name="OrderProduct.php" hash="1d33e879db0bb8557704ed3b66fb584d"/><file name="Product.php" hash="222db5151109eb9e6741cc1fe0d1ba7f"/><file name="Recommender.php" hash="12532b4efd6fdec560522a2ecf029ed9"/><file name="Recsins.php" hash="6a324de328fce850a5f3955e33fb3ec0"/><file name="Recsins_1.php" hash="310a9b224478749d35c5b59689ce1a07"/><file name="Status.php" hash="e3f1a39141d7a4aaa99252937f60ca8d"/><file name="User.php" hash="3244421d7331e5167e910f6fc3827361"/><file name=".DS_Store" hash="1f13e526a6f8ed14ac43ebd700cb6f60"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="RecsinsController.php" hash="41f9d0f8c32efaa9669cb71e79d63292"/><file name=".DS_Store" hash="eb69d7bfb18ebe8966b63ac54b04d1c0"/></dir><file name="IndexController.php" hash="2c9f228ed4e43c347235ed327365a219"/><file name=".DS_Store" hash="b415ad11c2cfebb78e16adb17ca06bff"/></dir><dir name="etc"><file name="api.xml" hash="c82c8df487ba808a8851ea9f1a8fe197"/><file name="config.xml" hash="8e9aa7b0d8c185b3ad3f773c7a96f643"/><file name="widget.xml" hash="c4f1829fa161f1119d817b64878f3b2f"/><file name=".DS_Store" hash="05e296fc2705958a70855fe260ceb9e5"/></dir><dir name="sql"><dir name="recsins_setup"><file name="mysql4-install-1.4.0.php" hash="33ae9091e3066779c13e738beae3650c"/><file name="mysql4-upgrade-1.4.0-1.4.1.php" hash="b636f16be2575bff013c14c012b34625"/><file name="mysql4-upgrade-1.4.1-1.4.2.php" hash="e73c5189c851c1ddb94d8ce8acd6f1a6"/><file name="mysql4-upgrade-1.4.2-1.4.3.php" hash="2297a4e5670b28a24c1fcd3d5d47aca6"/><file name="mysql4-upgrade-1.4.3-1.4.4.php" hash="6c76f6d7ffe9da72ebabd44779d13bde"/><file name="mysql4-upgrade-1.4.4-1.4.5.php" hash="1b932c2afb4543c6e067a7b769d48eb8"/><file name="mysql4-upgrade-1.4.5-1.4.6.php" hash="a851ccc0fa73440b74828c0b2ee993d9"/><file name="mysql4-upgrade-1.4.6-1.4.7.php" hash="923d491257ad9836738c1586d494e12c"/><file name="mysql4-upgrade-1.4.7-1.4.8.php" hash="a2c96553909227f5f5bd7a685691c0ac"/><file name="mysql4-upgrade-1.4.8-1.4.9.php" hash="86b6da79f302790ecb6a072c4ef68fb0"/><file name="mysql4-upgrade-1.4.9-1.5.0.php" hash="b10dd9d0dc951f3b783da743558af5ca"/><file name="mysql4-upgrade-1.5.0-1.5.1.php" hash="7f86ed73d2d35dd2989528046772fa8b"/><file name="mysql4-upgrade-1.5.1-1.5.2.php" hash="da8251355aa4811a099e5b22c9debca3"/><file name="mysql4-upgrade-1.5.2-1.5.3.php" hash="5ad2385bec084bc29a0673ed2a97231c"/><file name="mysql4-upgrade-1.5.3-1.5.4.php" hash="bda831da9d0a842c16092e1900d17087"/><file name=".DS_Store" hash="70fb1641ce88fc5fdb410744cb098089"/></dir><file name=".DS_Store" hash="fd4b270e5bdf8c2dbe56c9a98d4e6548"/></dir><file name="COPYING.txt" hash="4fe869ee987a340198fb0d54c55c47f1"/><file name=".DS_Store" hash="5fbb75ac088ce79fe0044c4951680ae6"/></dir><file name=".DS_Store" hash="6404be841b797bdacec75c7f7bb4a79c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="recsins.xml" hash="c2608f0c7f9f6efcbeb74bd5b1427206"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="recsins"><file name="cart.phtml" hash="04ee1833a0177a83644e4d1f3211c789"/><file name="category.phtml" hash="1979377cb8f06740a6b44a922e46dacd"/><file name="product.phtml" hash="3a623d6b48cceae14912b4daf5113ca2"/><file name="recsins.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name=".DS_Store" hash="f0948e76df06a209a9b7f51ff398fd60"/></dir></dir><dir name="layout"><file name="recsins.xml" hash="9185dc1897ec93c400edd2cd95b6533d"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Brainsins_Recsins.xml" hash="54e1c94137477548911c4ebce7eb97fe"/></dir></target><target name="magelocale"><dir name="es_ES"><file name="Brainsins_Recsins.csv" hash="7f731ae9e9faa8b003a63722ef3ce18a"/></dir><dir name="en_US"><file name="Brainsins_Recsins.csv" hash="6381582be5edc31cba54a052bb48b86d"/></dir></target></contents>
28
  <compatible/>
29
  <dependencies/>
30
  </package>