Minubo_Interface - Version 1.0.16

Version Notes

Optional additional fields in order headers (coupon_code).
Removed field "product_options" in order lines because of may-be corrupt content.

Download this release

Release Info

Developer sven rothe
Extension Minubo_Interface
Version 1.0.16
Comparing to
See all releases


Code changes from version 1.0.15 to 1.0.16

Files changed (9) hide show
  1. app/code/community/Minubo/Interface/Model/Export/Csv.php +13 -11
  2. app/code/community/Minubo/Interface/Model/Mysql4/Customeraddresses.php +4 -4
  3. app/code/community/Minubo/Interface/Model/Mysql4/Orderaddresses.php +4 -4
  4. app/code/community/Minubo/Interface/Model/Mysql4/Orderitems.php +2 -1
  5. app/code/community/Minubo/Interface/Model/Mysql4/Orders.php +7 -3
  6. app/code/community/Minubo/Interface/controllers/ExportController.php +13 -13
  7. app/code/community/Minubo/Interface/etc/config.xml +1 -1
  8. app/code/community/Minubo/Interface/etc/system.xml +11 -3
  9. package.xml +6 -5
app/code/community/Minubo/Interface/Model/Export/Csv.php CHANGED
@@ -46,26 +46,28 @@ class Minubo_Interface_Model_Export_Csv extends Minubo_Interface_Model_Export_Ab
46
 
47
  return $fileName;
48
  }
49
-
50
  public function exportTable($rows, $filename, $type, $colTitles = Array(), $skipCols = Array(), $renameCols = Array())
51
  {
52
  $fileName = $filename.'_export_'.date("Ymd_His").'.csv';
53
  $fp = fopen(Mage::getBaseDir('export').'/'.$fileName, 'w');
54
-
55
  $this->writeHeadRow($fp, $type, '', $colTitles, $skipCols, $renameCols);
56
  foreach ($rows as $row) {
57
- if (count($skipCols)==0) {
58
- fputcsv($fp, $row, self::DELIMITER, self::ENCLOSURE);
59
- } else {
 
 
60
  $this->writeCollection($row, $fp, $type, $skipCols);
61
- }
62
  }
63
 
64
  fclose($fp);
65
 
66
  return $fileName;
67
  }
68
-
69
  /**
70
  * Writes the head row with the column names in the csv file.
71
  *
@@ -77,7 +79,7 @@ class Minubo_Interface_Model_Export_Csv extends Minubo_Interface_Model_Export_Ab
77
  * @param $renameCols
78
  */
79
  protected function writeHeadRow($fp, $group, $pdata='', $cols=array(), $skipCols=array(), $renameCols=array())
80
- {
81
  $r = array();
82
  if($cols) {
83
  foreach ($cols as $col => $val) if(!in_array($col, $skipCols)) { if(array_key_exists($col, $renameCols)) $r[] = $renameCols[$col]; else $r[] = $col; }
@@ -90,14 +92,14 @@ class Minubo_Interface_Model_Export_Csv extends Minubo_Interface_Model_Export_Ab
90
  $data = array();
91
  foreach ($entries as $col => $value) {
92
  if(count($skipCols)>0) {
93
- if(!in_array($col, $skipCols)) $data[$col] = str_replace(chr(13).chr(10),' ',str_replace('"',"'",$value));
94
  } else {
95
- $data[$col] = str_replace(chr(13).chr(10),' ',str_replace('"',"'",$value));
96
  }
97
  }
98
  fputcsv($fp, $data, self::DELIMITER, self::ENCLOSURE);
99
  }
100
-
101
  protected function writeCountry($country, $fp, $group)
102
  {
103
  $common = array(
46
 
47
  return $fileName;
48
  }
49
+
50
  public function exportTable($rows, $filename, $type, $colTitles = Array(), $skipCols = Array(), $renameCols = Array())
51
  {
52
  $fileName = $filename.'_export_'.date("Ymd_His").'.csv';
53
  $fp = fopen(Mage::getBaseDir('export').'/'.$fileName, 'w');
54
+
55
  $this->writeHeadRow($fp, $type, '', $colTitles, $skipCols, $renameCols);
56
  foreach ($rows as $row) {
57
+ // fputcsv wird nicht mehr verwendet um LF entfernen zu k�nnen
58
+ // if (count($skipCols)==0) {
59
+ // fputcsv($fp, $row, self::DELIMITER, self::ENCLOSURE);
60
+ // } else {
61
+ // mit bereinigung von LF, CRLF, "
62
  $this->writeCollection($row, $fp, $type, $skipCols);
63
+ // }
64
  }
65
 
66
  fclose($fp);
67
 
68
  return $fileName;
69
  }
70
+
71
  /**
72
  * Writes the head row with the column names in the csv file.
73
  *
79
  * @param $renameCols
80
  */
81
  protected function writeHeadRow($fp, $group, $pdata='', $cols=array(), $skipCols=array(), $renameCols=array())
82
+ {
83
  $r = array();
84
  if($cols) {
85
  foreach ($cols as $col => $val) if(!in_array($col, $skipCols)) { if(array_key_exists($col, $renameCols)) $r[] = $renameCols[$col]; else $r[] = $col; }
92
  $data = array();
93
  foreach ($entries as $col => $value) {
94
  if(count($skipCols)>0) {
95
+ if(!in_array($col, $skipCols)) $data[$col] = str_replace(chr(10),' ',str_replace(chr(13).chr(10),' ',str_replace('"',"'",$value)));
96
  } else {
97
+ $data[$col] = str_replace(chr(10),' ',str_replace(chr(13).chr(10),' ',str_replace('"',"'",$value)));
98
  }
99
  }
100
  fputcsv($fp, $data, self::DELIMITER, self::ENCLOSURE);
101
  }
102
+
103
  protected function writeCountry($country, $fp, $group)
104
  {
105
  $common = array(
app/code/community/Minubo/Interface/Model/Mysql4/Customeraddresses.php CHANGED
@@ -33,7 +33,7 @@ class Minubo_Interface_Model_Mysql4_Customeraddresses extends Mage_Core_Model_My
33
  return $id;
34
  }
35
 
36
- public function loadAll(){
37
  $table = $this->getMainTable();
38
  $table2 = $this->getTable('customer_address_entity');
39
  $cond2 = $this->_getReadAdapter()->quoteInto('oa.customer_address_id = ca.entity_id','');
@@ -43,7 +43,7 @@ class Minubo_Interface_Model_Mysql4_Customeraddresses extends Mage_Core_Model_My
43
  $cond4 = $this->_getReadAdapter()->quoteInto('c.group_id = cg.customer_group_id','');
44
  $table5 = $this->getTable('sales_flat_order');
45
  $cond5 = $this->_getReadAdapter()->quoteInto('oa.parent_id = o.entity_id','');
46
- $where = $this->_getReadAdapter()->quoteInto("oa.entity_id > ?", 0);
47
  $select = $this->_getReadAdapter()->select()->from(array('oa'=>$table))
48
  ->join(array('ca'=>$table2), $cond2)
49
  ->join(array('c'=>$table3), $cond3)
@@ -56,7 +56,7 @@ class Minubo_Interface_Model_Mysql4_Customeraddresses extends Mage_Core_Model_My
56
  return $this->_getReadAdapter()->fetchAll($select);
57
  }
58
 
59
- public function loadLimited($limit, $offset){
60
  $table = $this->getMainTable();
61
  $table2 = $this->getTable('customer_address_entity');
62
  $cond2 = $this->_getReadAdapter()->quoteInto('oa.customer_address_id = ca.entity_id','');
@@ -66,7 +66,7 @@ class Minubo_Interface_Model_Mysql4_Customeraddresses extends Mage_Core_Model_My
66
  $cond4 = $this->_getReadAdapter()->quoteInto('c.group_id = cg.customer_group_id','');
67
  $table5 = $this->getTable('sales_flat_order');
68
  $cond5 = $this->_getReadAdapter()->quoteInto('oa.parent_id = o.entity_id','');
69
- $where = $this->_getReadAdapter()->quoteInto("oa.entity_id > ?", 0);
70
  $select = $this->_getReadAdapter()->select()->from(array('oa'=>$table))
71
  ->join(array('ca'=>$table2), $cond2)
72
  ->join(array('c'=>$table3), $cond3)
33
  return $id;
34
  }
35
 
36
+ public function loadAllByStoreId($store_id){
37
  $table = $this->getMainTable();
38
  $table2 = $this->getTable('customer_address_entity');
39
  $cond2 = $this->_getReadAdapter()->quoteInto('oa.customer_address_id = ca.entity_id','');
43
  $cond4 = $this->_getReadAdapter()->quoteInto('c.group_id = cg.customer_group_id','');
44
  $table5 = $this->getTable('sales_flat_order');
45
  $cond5 = $this->_getReadAdapter()->quoteInto('oa.parent_id = o.entity_id','');
46
+ $where = $this->_getReadAdapter()->quoteInto("c.store_id = ?", $store_id);
47
  $select = $this->_getReadAdapter()->select()->from(array('oa'=>$table))
48
  ->join(array('ca'=>$table2), $cond2)
49
  ->join(array('c'=>$table3), $cond3)
56
  return $this->_getReadAdapter()->fetchAll($select);
57
  }
58
 
59
+ public function loadLimitedByStoreId($limit, $offset, $store_id){
60
  $table = $this->getMainTable();
61
  $table2 = $this->getTable('customer_address_entity');
62
  $cond2 = $this->_getReadAdapter()->quoteInto('oa.customer_address_id = ca.entity_id','');
66
  $cond4 = $this->_getReadAdapter()->quoteInto('c.group_id = cg.customer_group_id','');
67
  $table5 = $this->getTable('sales_flat_order');
68
  $cond5 = $this->_getReadAdapter()->quoteInto('oa.parent_id = o.entity_id','');
69
+ $where = $this->_getReadAdapter()->quoteInto("c.store_id = ?", $store_id);
70
  $select = $this->_getReadAdapter()->select()->from(array('oa'=>$table))
71
  ->join(array('ca'=>$table2), $cond2)
72
  ->join(array('c'=>$table3), $cond3)
app/code/community/Minubo/Interface/Model/Mysql4/Orderaddresses.php CHANGED
@@ -33,13 +33,13 @@ class Minubo_Interface_Model_Mysql4_Orderaddresses extends Mage_Core_Model_Mysql
33
  return $id;
34
  }
35
 
36
- public function loadAll(){
37
  $table = $this->getMainTable();
38
  $table2 = $this->getTable('sales_flat_order');
39
  $cond2 = $this->_getReadAdapter()->quoteInto('o.billing_address_id = oab.entity_id','');
40
  $table3 = $this->getTable('sales_flat_order_address');
41
  $cond3 = $this->_getReadAdapter()->quoteInto("o.shipping_address_id = oas.entity_id ",'');
42
- $where = $this->_getReadAdapter()->quoteInto("oas.entity_id > ?", 0);
43
  $select = $this->_getReadAdapter()->select()
44
  ->from(array('oab'=>$table))
45
  ->join(array('o'=>$table2), $cond2)
@@ -51,13 +51,13 @@ class Minubo_Interface_Model_Mysql4_Orderaddresses extends Mage_Core_Model_Mysql
51
  return $this->_getReadAdapter()->fetchAll($select);
52
  }
53
 
54
- public function loadLimited($limit, $offset){
55
  $table = $this->getMainTable();
56
  $table2 = $this->getTable('sales_flat_order');
57
  $cond2 = $this->_getReadAdapter()->quoteInto('o.billing_address_id = oab.entity_id','');
58
  $table3 = $this->getTable('sales_flat_order_address');
59
  $cond3 = $this->_getReadAdapter()->quoteInto("o.shipping_address_id = oas.entity_id ",'');
60
- $where = $this->_getReadAdapter()->quoteInto("oas.entity_id > ?", 0);
61
  $select = $this->_getReadAdapter()->select()
62
  ->from(array('oab'=>$table))
63
  ->join(array('o'=>$table2), $cond2)
33
  return $id;
34
  }
35
 
36
+ public function loadAllByStoreId($store_id){
37
  $table = $this->getMainTable();
38
  $table2 = $this->getTable('sales_flat_order');
39
  $cond2 = $this->_getReadAdapter()->quoteInto('o.billing_address_id = oab.entity_id','');
40
  $table3 = $this->getTable('sales_flat_order_address');
41
  $cond3 = $this->_getReadAdapter()->quoteInto("o.shipping_address_id = oas.entity_id ",'');
42
+ $where = $this->_getReadAdapter()->quoteInto("o.store_id = ?", $store_id);
43
  $select = $this->_getReadAdapter()->select()
44
  ->from(array('oab'=>$table))
45
  ->join(array('o'=>$table2), $cond2)
51
  return $this->_getReadAdapter()->fetchAll($select);
52
  }
53
 
54
+ public function loadLimitedByStoreId($limit, $offset, $store_id){
55
  $table = $this->getMainTable();
56
  $table2 = $this->getTable('sales_flat_order');
57
  $cond2 = $this->_getReadAdapter()->quoteInto('o.billing_address_id = oab.entity_id','');
58
  $table3 = $this->getTable('sales_flat_order_address');
59
  $cond3 = $this->_getReadAdapter()->quoteInto("o.shipping_address_id = oas.entity_id ",'');
60
+ $where = $this->_getReadAdapter()->quoteInto("o.store_id = ?", $store_id);
61
  $select = $this->_getReadAdapter()->select()
62
  ->from(array('oab'=>$table))
63
  ->join(array('o'=>$table2), $cond2)
app/code/community/Minubo/Interface/Model/Mysql4/Orderitems.php CHANGED
@@ -14,7 +14,8 @@ class Minubo_Interface_Model_Mysql4_Orderitems extends Mage_Core_Model_Mysql4_Ab
14
  'op.tax_Percent','op.tax_Amount','op.base_Tax_Amount','op.tax_Invoiced','op.base_Tax_Invoiced','op.discount_Percent',
15
  'op.discount_Amount','op.base_Discount_Amount','op.discount_Invoiced','op.base_Discount_Invoiced','op.amount_Refunded',
16
  'op.base_Amount_Refunded','op.row_Total','op.base_Row_Total','op.row_Invoiced','op.base_Row_Invoiced','op.base_Tax_Before_Discount',
17
- 'op.tax_Before_Discount','op.product_Type','op.product_Options','op.sku','op.applied_Rule_Ids','op.gift_Message_Id','o.store_id');
 
18
  }
19
 
20
  public function loadByField($field,$value){
14
  'op.tax_Percent','op.tax_Amount','op.base_Tax_Amount','op.tax_Invoiced','op.base_Tax_Invoiced','op.discount_Percent',
15
  'op.discount_Amount','op.base_Discount_Amount','op.discount_Invoiced','op.base_Discount_Invoiced','op.amount_Refunded',
16
  'op.base_Amount_Refunded','op.row_Total','op.base_Row_Total','op.row_Invoiced','op.base_Row_Invoiced','op.base_Tax_Before_Discount',
17
+ 'op.tax_Before_Discount','op.product_Type','op.product_Type AS product_Options','op.sku','op.applied_Rule_Ids','op.gift_Message_Id','o.store_id');
18
+ // op.product_Type doppelt statt op.product_Options weil letzteres Probleme macht
19
  }
20
 
21
  public function loadByField($field,$value){
app/code/community/Minubo/Interface/Model/Mysql4/Orders.php CHANGED
@@ -7,10 +7,10 @@ class Minubo_Interface_Model_Mysql4_Orders extends Mage_Core_Model_Mysql4_Abstra
7
  }
8
 
9
  protected function getColumns() {
10
- return array('o.entity_id as orderKey','increment_id as orderNumber','created_At','updated_At',"ifnull(oab.customer_address_id,concat('g_',oab.entity_id)) as customerKey",
11
  // 'o.customer_id as customerKey','o.coupon_code as Credit_Card_Type',
12
- 'oas.postcode as shippingAddressPostcode','oas.city as shippingAddressCity','oas.country_id as shippingAddressCountryId',
13
- // 'o.coupon_code as parentKey','o.coupon_code as isActive','o.status','o.coupon_code as comment',
14
  'oas.entity_id as shippingAddressIncrementId','oas.parent_id as shippingAddressParentId',
15
  'oas.region_id as shippingAddressRegionId','store_Id','billing_Address_Id','shipping_Address_Id','quote_Id','is_Virtual','customer_Group_Id','customer_Is_Guest',
16
  'shipping_address_id as shippingAddressAddressId',
@@ -22,6 +22,10 @@ class Minubo_Interface_Model_Mysql4_Orders extends Mage_Core_Model_Mysql4_Abstra
22
  'global_Currency_Code','base_Currency_Code','store_Currency_Code',
23
  'order_Currency_Code','shipping_Method','shipping_Description', /* shippingAddressIsActive */ 'oas.address_type as shippingAddressAddressType',
24
  'oas.region as shippingAddressRegion','op.method as paymentMethod','oab.customer_address_id','md5(o.customer_email) as Customer_HashCode');
 
 
 
 
25
  }
26
 
27
  /*
7
  }
8
 
9
  protected function getColumns() {
10
+ $r = array('o.entity_id as orderKey','increment_id as orderNumber','created_At','updated_At',"ifnull(oab.customer_address_id,concat('g_',oab.entity_id)) as customerKey",
11
  // 'o.customer_id as customerKey','o.coupon_code as Credit_Card_Type',
12
+ 'oas.postcode as shippingAddressPostcode','oas.city as shippingAddressCity','oas.country_id as shippingAddressCountryId',
13
+ // 'o.coupon_code as parentKey','o.coupon_code as isActive','o.status','o.coupon_code as comment',
14
  'oas.entity_id as shippingAddressIncrementId','oas.parent_id as shippingAddressParentId',
15
  'oas.region_id as shippingAddressRegionId','store_Id','billing_Address_Id','shipping_Address_Id','quote_Id','is_Virtual','customer_Group_Id','customer_Is_Guest',
16
  'shipping_address_id as shippingAddressAddressId',
22
  'global_Currency_Code','base_Currency_Code','store_Currency_Code',
23
  'order_Currency_Code','shipping_Method','shipping_Description', /* shippingAddressIsActive */ 'oas.address_type as shippingAddressAddressType',
24
  'oas.region as shippingAddressRegion','op.method as paymentMethod','oab.customer_address_id','md5(o.customer_email) as Customer_HashCode');
25
+
26
+ $fields = Mage::getStoreConfig('minubo_interface/settings/orderfields',Mage::app()->getStore());
27
+ $f = explode(',', str_replace(' ','',$fields));
28
+ return array_merge($r, $f);
29
  }
30
 
31
  /*
app/code/community/Minubo/Interface/controllers/ExportController.php CHANGED
@@ -85,7 +85,7 @@ class Minubo_Interface_ExportController extends Mage_Core_Controller_Front_Actio
85
 
86
  $model = Mage::getModel('minubo_interface/tables');
87
  $model->init('orderaddresses');
88
- $orderaddresses = $model->readAll();
89
  echo '# OrderAddresses: '.count($orderaddresses).'<br>';
90
 
91
  $model = Mage::getModel('minubo_interface/tables');
@@ -95,7 +95,7 @@ class Minubo_Interface_ExportController extends Mage_Core_Controller_Front_Actio
95
 
96
  $model = Mage::getModel('minubo_interface/tables');
97
  $model->init('customeraddresses');
98
- $customeraddresses = $model->readAll();
99
  echo '# CustomerAddresses: '.count($customeraddresses).'<br>';
100
 
101
  $model = Mage::getModel('minubo_interface/tables');
@@ -211,16 +211,16 @@ class Minubo_Interface_ExportController extends Mage_Core_Controller_Front_Actio
211
 
212
  public function handleCountries (&$rows, $filename, $type, $pdata, $start, $download)
213
  {
214
- switch(Mage::getStoreConfig('minubo_interface/settings/output_type',Mage::app()->getStore())){
215
- case 'Standard':
216
  $file = Mage::getModel('minubo_interface/export_csv')->exportCountries($rows, $filename, $type, $pdata);
217
  if (!$download) {
218
  echo file_get_contents(Mage::getBaseDir('export').'/'.$file);
219
  } else {
220
  $this->_prepareDownloadResponse($file, file_get_contents(Mage::getBaseDir('export').'/'.$file));
221
  }
222
- break;
223
- }
224
  $config = new Mage_Core_Model_Config();
225
  $config->saveConfig('minubo_interface/settings/lastexportenddate', str_replace('.','-',date('Y.m.d H:i:s')), 'default', 0);
226
  $config = null;
@@ -248,11 +248,11 @@ class Minubo_Interface_ExportController extends Mage_Core_Controller_Front_Actio
248
 
249
  public function orderCustomersAction ()
250
  {
251
- $this->handleTable ('orderaddresses', 'orderaddr', 'orderAddresses', Array(), Array(), Array());
252
  }
253
  public function orderAddressesAction ()
254
  {
255
- $this->handleTable ('orderaddresses', 'orderaddr', 'orderAddresses', Array(), Array(), Array());
256
  }
257
 
258
  public function customersAction ()
@@ -263,7 +263,7 @@ class Minubo_Interface_ExportController extends Mage_Core_Controller_Front_Actio
263
 
264
  public function customerAddressesAction ()
265
  {
266
- $this->handleTable ('orderaddresses', 'orderaddr', 'orderaddresses', Array(), Array(), Array());
267
  }
268
 
269
  public function productsAction ()
@@ -328,8 +328,8 @@ class Minubo_Interface_ExportController extends Mage_Core_Controller_Front_Actio
328
  $start = $this->getMicrotime();
329
  $this->getParam($lastChangeDate, $maxChangeDate, $lastOrderID, $maxOrderID, $limit, $offset, $debug, $pdata, $store_id, $download);
330
 
331
- switch(Mage::getStoreConfig('minubo_interface/settings/output_type',Mage::app()->getStore())){
332
- case 'Standard':
333
  $model = Mage::getModel('minubo_interface/tables');
334
  if($debug) echo 'model->init: '.$sqlinterface.'<br>';
335
  $model->init($sqlinterface);
@@ -364,8 +364,8 @@ class Minubo_Interface_ExportController extends Mage_Core_Controller_Front_Actio
364
  } else {
365
  $this->_prepareDownloadResponse($file, file_get_contents(Mage::getBaseDir('export').'/'.$file));
366
  }
367
- break;
368
- }
369
  $config = new Mage_Core_Model_Config();
370
  $config->saveConfig('minubo_interface/settings/lastexportenddate', str_replace('.','-',date('Y.m.d H:i:s')), 'default', 0);
371
  $config = null;
85
 
86
  $model = Mage::getModel('minubo_interface/tables');
87
  $model->init('orderaddresses');
88
+ $orderaddresses = $model->readAllByStoreId($store_id);
89
  echo '# OrderAddresses: '.count($orderaddresses).'<br>';
90
 
91
  $model = Mage::getModel('minubo_interface/tables');
95
 
96
  $model = Mage::getModel('minubo_interface/tables');
97
  $model->init('customeraddresses');
98
+ $customeraddresses = $model->readAllByStoreId($store_id);
99
  echo '# CustomerAddresses: '.count($customeraddresses).'<br>';
100
 
101
  $model = Mage::getModel('minubo_interface/tables');
211
 
212
  public function handleCountries (&$rows, $filename, $type, $pdata, $start, $download)
213
  {
214
+ // switch(Mage::getStoreConfig('minubo_interface/settings/output_type',Mage::app()->getStore())){
215
+ // case 'Standard':
216
  $file = Mage::getModel('minubo_interface/export_csv')->exportCountries($rows, $filename, $type, $pdata);
217
  if (!$download) {
218
  echo file_get_contents(Mage::getBaseDir('export').'/'.$file);
219
  } else {
220
  $this->_prepareDownloadResponse($file, file_get_contents(Mage::getBaseDir('export').'/'.$file));
221
  }
222
+ // break;
223
+ // }
224
  $config = new Mage_Core_Model_Config();
225
  $config->saveConfig('minubo_interface/settings/lastexportenddate', str_replace('.','-',date('Y.m.d H:i:s')), 'default', 0);
226
  $config = null;
248
 
249
  public function orderCustomersAction ()
250
  {
251
+ $this->handleTable ('orderaddresses', 'orderaddr', 'orderAddresses', Array(), Array(), Array(), true);
252
  }
253
  public function orderAddressesAction ()
254
  {
255
+ $this->handleTable ('orderaddresses', 'orderaddr', 'orderAddresses', Array(), Array(), Array(), true);
256
  }
257
 
258
  public function customersAction ()
263
 
264
  public function customerAddressesAction ()
265
  {
266
+ $this->handleTable ('orderaddresses', 'orderaddr', 'orderaddresses', Array(), Array(), Array(), true);
267
  }
268
 
269
  public function productsAction ()
328
  $start = $this->getMicrotime();
329
  $this->getParam($lastChangeDate, $maxChangeDate, $lastOrderID, $maxOrderID, $limit, $offset, $debug, $pdata, $store_id, $download);
330
 
331
+ // switch(Mage::getStoreConfig('minubo_interface/settings/output_type',Mage::app()->getStore())){
332
+ // case 'Standard':
333
  $model = Mage::getModel('minubo_interface/tables');
334
  if($debug) echo 'model->init: '.$sqlinterface.'<br>';
335
  $model->init($sqlinterface);
364
  } else {
365
  $this->_prepareDownloadResponse($file, file_get_contents(Mage::getBaseDir('export').'/'.$file));
366
  }
367
+ // break;
368
+ // }
369
  $config = new Mage_Core_Model_Config();
370
  $config->saveConfig('minubo_interface/settings/lastexportenddate', str_replace('.','-',date('Y.m.d H:i:s')), 'default', 0);
371
  $config = null;
app/code/community/Minubo/Interface/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Minubo_Interface>
5
- <version>1.0.15</version>
6
  </Minubo_Interface>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Minubo_Interface>
5
+ <version>1.0.16</version>
6
  </Minubo_Interface>
7
  </modules>
8
  <global>
app/code/community/Minubo/Interface/etc/system.xml CHANGED
@@ -61,7 +61,7 @@
61
  <show_in_website>1</show_in_website>
62
  <show_in_store>0</show_in_store>
63
  </newhash>
64
- <output_type translate="label">
65
  <label>Output type</label>
66
  <frontend_type>select</frontend_type>
67
  <source_model>Minubo_Interface_Model_Options_Options</source_model>
@@ -69,15 +69,23 @@
69
  <show_in_default>1</show_in_default>
70
  <show_in_website>1</show_in_website>
71
  <show_in_store>0</show_in_store>
72
- </output_type>
73
  <storeid translate="label">
74
  <label>Store ID (optional, Default: 1)</label>
75
  <frontend_type>text</frontend_type>
76
- <sort_order>5</sort_order>
77
  <show_in_default>1</show_in_default>
78
  <show_in_website>1</show_in_website>
79
  <show_in_store>0</show_in_store>
80
  </storeid>
 
 
 
 
 
 
 
 
81
  <productbrand translate="label">
82
  <label>Additional product-field brand (see catalog_product_flat_1)</label>
83
  <frontend_type>text</frontend_type>
61
  <show_in_website>1</show_in_website>
62
  <show_in_store>0</show_in_store>
63
  </newhash>
64
+ <!-- output_type translate="label">
65
  <label>Output type</label>
66
  <frontend_type>select</frontend_type>
67
  <source_model>Minubo_Interface_Model_Options_Options</source_model>
69
  <show_in_default>1</show_in_default>
70
  <show_in_website>1</show_in_website>
71
  <show_in_store>0</show_in_store>
72
+ </output_type -->
73
  <storeid translate="label">
74
  <label>Store ID (optional, Default: 1)</label>
75
  <frontend_type>text</frontend_type>
76
+ <sort_order>4</sort_order>
77
  <show_in_default>1</show_in_default>
78
  <show_in_website>1</show_in_website>
79
  <show_in_store>0</show_in_store>
80
  </storeid>
81
+ <orderfields translate="label">
82
+ <label>Additional order-field (see sales_flat_order)</label>
83
+ <frontend_type>text</frontend_type>
84
+ <sort_order>5</sort_order>
85
+ <show_in_default>1</show_in_default>
86
+ <show_in_website>1</show_in_website>
87
+ <show_in_store>0</show_in_store>
88
+ </orderfields>
89
  <productbrand translate="label">
90
  <label>Additional product-field brand (see catalog_product_flat_1)</label>
91
  <frontend_type>text</frontend_type>
package.xml CHANGED
@@ -1,18 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Minubo_Interface</name>
4
- <version>1.0.15</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Minubo Interface connects your Magento Shop to the All-In-One eCommerce Cloud BI Solution at minubo.com</summary>
10
  <description>Minubo Interface connects your Magento Shop to the All-In-One eCommerce Cloud BI Solution at minubo.com. With this Extension in your Magento Shop your minubo Account at minubo.com can be configured to poll the newest data - of cause without any personalization - every day to bring the information to your screen, which you need to optimize your sales business. See more about minubo at minubo.com Minubo Interface supports Magento 1.5 (or newer). In Backend you can configure the Minubo Interface at System/Configuration/Sales/Minubo Interface (enable/disable, generate access key and see information about last export). Right now, the Minubo Interface is at the end of beta status and you have to change in the Magento Connect Backend the setting to allow download of other than stable releases.</description>
11
- <notes>Software maintenance and minor bug-fixes.</notes>
 
12
  <authors><author><name>sven rothe</name><user>minubo</user><email>sven@minubo.com</email></author></authors>
13
- <date>2013-10-28</date>
14
- <time>14:13:10</time>
15
- <contents><target name="magecommunity"><dir name="Minubo"><dir name="Interface"><dir name="Block"><dir name="Adminhtml"><file name="Authhash.php" hash="c98e63efd5e4e42a6bc1c223a75176c3"/><file name="Lastchangedate.php" hash="c82ee55fad83d848f47a8594bd25c5af"/><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="c288b69aa22cc9ff5e978ff2b89646e9"/></dir></dir></dir><file name="Version.php" hash="31db32eca5dcaf3ad86c747bb3e11efc"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d9cf690ff97d2014cd3e443c07ab4ea7"/></dir><dir name="Model"><dir name="Export"><file name="Abstractcsv.php" hash="94a1b9c669ff01892994faa507152f9c"/><file name="Csv.php" hash="dd8c0131b7099fb914fbdee1d6e1a468"/><file name="Status.php" hash="cef67926aef558b87d4e3bcb02386743"/></dir><dir name="Mysql4"><file name="Categories.php" hash="7aaf0b687f5127bd07a2d7b0c8fb47ba"/><file name="Creditmemoitems.php" hash="ec84aecc9efe31e0ac3be742ad973bcb"/><file name="Creditmemos.php" hash="2c9e399bdd89749815e3ebfac0b2337e"/><file name="Customeraddresses.php" hash="93d3c82c80f85de361de5e7e6c4ecf68"/><file name="Customers.php" hash="bc7ea00bed52bee359d4fabc6b6737e7"/><file name="Invoiceitems.php" hash="ae59d2c274a5dd8980f89e08707d342e"/><file name="Invoices.php" hash="4822b837cbdc8f4efb8b9314ca8d9c7f"/><file name="Orderaddresses.php" hash="648014e35db97bd57c4830e0f4882ad4"/><file name="Orderitems.php" hash="a1b6867985831328480b918af1c3c0d2"/><file name="Orders.php" hash="fdcb02b5802692675f07d813985e210f"/><file name="Productattributes.php" hash="3f1d8d692e5a96d231548568bc79b228"/><file name="Productcategories.php" hash="56a00cecf2cfe994fdeae9db947f653d"/><file name="Products.php" hash="2efaa98815a5b16d85999d2209157ffc"/><file name="Regions.php" hash="f1575516572fbd9a58e8c025fefa95d4"/></dir><dir name="Options"><file name="Options.php" hash="b696a731d9daa7f53c8375f19ad3838f"/><file name="Version.php" hash="fafcca0d77fbbe7fb26b869a845963bf"/></dir><dir name="Read"><file name="Collections.php" hash="2af8284c1653b0637c9d1542397043f1"/><file name="Common.php" hash="18b089bb03cbb226b95db428a7c31ef2"/></dir><file name="Tables.php" hash="e0f2ee1d70cc61cac2ad428b09ecf6e7"/></dir><dir name="controllers"><file name="ExportController.php" hash="f16ac4d3affa5c765d80442c189b77d0"/></dir><dir name="etc"><file name="adminhtml.xml" hash="375c548aacaf6f1bfdf4de3af7b29dfb"/><file name="config.xml" hash="7409a775414df492cb52f875e53e9a34"/><file name="system.xml" hash="682c1364dd016ebde10820ecfa21382f"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="minubo"><dir name="system"><dir name="config"><file name="button.phtml" hash=""/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Minubo_Interface.xml" hash=""/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Minubo_Interface</name>
4
+ <version>1.0.16</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Minubo Interface connects your Magento Shop to the All-In-One eCommerce Cloud BI Solution at minubo.com</summary>
10
  <description>Minubo Interface connects your Magento Shop to the All-In-One eCommerce Cloud BI Solution at minubo.com. With this Extension in your Magento Shop your minubo Account at minubo.com can be configured to poll the newest data - of cause without any personalization - every day to bring the information to your screen, which you need to optimize your sales business. See more about minubo at minubo.com Minubo Interface supports Magento 1.5 (or newer). In Backend you can configure the Minubo Interface at System/Configuration/Sales/Minubo Interface (enable/disable, generate access key and see information about last export). Right now, the Minubo Interface is at the end of beta status and you have to change in the Magento Connect Backend the setting to allow download of other than stable releases.</description>
11
+ <notes>Optional additional fields in order headers (coupon_code).&#xD;
12
+ Removed field "product_options" in order lines because of may-be corrupt content.</notes>
13
  <authors><author><name>sven rothe</name><user>minubo</user><email>sven@minubo.com</email></author></authors>
14
+ <date>2013-11-01</date>
15
+ <time>10:09:54</time>
16
+ <contents><target name="magecommunity"><dir name="Minubo"><dir name="Interface"><dir name="Block"><dir name="Adminhtml"><file name="Authhash.php" hash="c98e63efd5e4e42a6bc1c223a75176c3"/><file name="Lastchangedate.php" hash="c82ee55fad83d848f47a8594bd25c5af"/><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="c288b69aa22cc9ff5e978ff2b89646e9"/></dir></dir></dir><file name="Version.php" hash="31db32eca5dcaf3ad86c747bb3e11efc"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d9cf690ff97d2014cd3e443c07ab4ea7"/></dir><dir name="Model"><dir name="Export"><file name="Abstractcsv.php" hash="94a1b9c669ff01892994faa507152f9c"/><file name="Csv.php" hash="c3788d63aaa16a83b2f280cfbd40c2f1"/><file name="Status.php" hash="cef67926aef558b87d4e3bcb02386743"/></dir><dir name="Mysql4"><file name="Categories.php" hash="7aaf0b687f5127bd07a2d7b0c8fb47ba"/><file name="Creditmemoitems.php" hash="ec84aecc9efe31e0ac3be742ad973bcb"/><file name="Creditmemos.php" hash="2c9e399bdd89749815e3ebfac0b2337e"/><file name="Customeraddresses.php" hash="51b01e757c7b362dfc7fa6978bbfadb8"/><file name="Customers.php" hash="bc7ea00bed52bee359d4fabc6b6737e7"/><file name="Invoiceitems.php" hash="ae59d2c274a5dd8980f89e08707d342e"/><file name="Invoices.php" hash="4822b837cbdc8f4efb8b9314ca8d9c7f"/><file name="Orderaddresses.php" hash="f0ba0d7ef804ae787f72c67f5f7c31c5"/><file name="Orderitems.php" hash="db5e58f8288bc0882649be768c7f915a"/><file name="Orders.php" hash="527473746c1c83be7a142c116ec8885f"/><file name="Productattributes.php" hash="3f1d8d692e5a96d231548568bc79b228"/><file name="Productcategories.php" hash="56a00cecf2cfe994fdeae9db947f653d"/><file name="Products.php" hash="2efaa98815a5b16d85999d2209157ffc"/><file name="Regions.php" hash="f1575516572fbd9a58e8c025fefa95d4"/></dir><dir name="Options"><file name="Options.php" hash="b696a731d9daa7f53c8375f19ad3838f"/><file name="Version.php" hash="fafcca0d77fbbe7fb26b869a845963bf"/></dir><dir name="Read"><file name="Collections.php" hash="2af8284c1653b0637c9d1542397043f1"/><file name="Common.php" hash="18b089bb03cbb226b95db428a7c31ef2"/></dir><file name="Tables.php" hash="e0f2ee1d70cc61cac2ad428b09ecf6e7"/></dir><dir name="controllers"><file name="ExportController.php" hash="4e60f5e0bf88984ffa12567ea2e6b3c8"/></dir><dir name="etc"><file name="adminhtml.xml" hash="375c548aacaf6f1bfdf4de3af7b29dfb"/><file name="config.xml" hash="73a4c22fc05f5de651b0fcf9e60478bf"/><file name="system.xml" hash="fa3045a31b3f51b7e2bdbeb8bbf41b30"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="minubo"><dir name="system"><dir name="config"><file name="button.phtml" hash=""/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Minubo_Interface.xml" hash=""/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>