Qinvoice_Connect - Version 1.0.9

Version Notes

Updated dependencies

Download this release

Release Info

Developer Casper Mekel
Extension Qinvoice_Connect
Version 1.0.9
Comparing to
See all releases


Code changes from version 1.0.8 to 1.0.9

Files changed (2) hide show
  1. app/code/community/Qinvoice/Connect/Model/Order/Observer.php +6 -2
  2. package.xml +6 -6
app/code/community/Qinvoice/Connect/Model/Order/Observer.php CHANGED
@@ -176,6 +176,7 @@ class Qinvoice_Connect_Model_Order_Observer
176
  $invoice->firstname = $rowThree['firstname']; // Your customers contact name
177
  $invoice->lastname = $rowThree['lastname']; // Your customers contact name
178
  $invoice->email = $rowOne['customer_email']; // Your customers emailaddress (invoice will be sent here)
 
179
  $invoice->address = $rowThree['street']; // Self-explanatory
180
  $invoice->zipcode = $rowThree['postcode']; // Self-explanatory
181
  $invoice->city = $rowThree['city']; // Self-explanatory
@@ -298,7 +299,8 @@ class Qinvoice_Connect_Model_Order_Observer
298
  'code' => $productcode,
299
  'description' => "[".$arrData[$i]['sku']."] ".trim($arrData[$i]['name']) . $varDescription,
300
  'price' => $arrData[$i]['base_price']*100,
301
- 'price_incl' => ((($arrData[$i]['base_price']*$arrData[$i]['qty_ordered'])+$arrData[$i]['tax_amount'])/$arrData[$i]['qty_ordered'])*100,
 
302
  'price_vat' => ($arrData[$i]['tax_amount']/$arrData[$i]['qty_ordered'])*100,
303
  'vatpercentage' => trim(number_format($arrData[$i]['tax_percent'],2,'.', ''))*100,
304
  'discount' => trim(number_format($arrData[$i]['base_discount_amount'], 2, '.', '')/$arrData[$i]['base_price'])*100,
@@ -317,7 +319,7 @@ class Qinvoice_Connect_Model_Order_Observer
317
  'price' => $rowOne['shipping_amount']*100,
318
  'price_incl' => $rowOne['shipping_incl_tax']*100,
319
  'price_vat' => $rowOne['shipping_tax_amount']*100,
320
- 'vatpercentage' => ($rowOne['shipping_tax_amount']/$rowOne['shipping_amount'])*100,
321
  'discount' => 0,
322
  'quantity' => 100,
323
  'categories' => 'shipping'
@@ -468,12 +470,14 @@ class qinvoice{
468
  <login mode="newInvoice">
469
  <username><![CDATA['.$this->username.']]></username>
470
  <password><![CDATA['.$this->password.']]></password>
 
471
  </login>
472
  <invoice>
473
  <companyname><![CDATA['. $this->companyname .']]></companyname>
474
  <firstname><![CDATA['. $this->firstname .']]></firstname>
475
  <lastname><![CDATA['. $this->lastname .']]></lastname>
476
  <email><![CDATA['. $this->email .']]></email>
 
477
  <address><![CDATA['. $this->address .']]></address>
478
  <zipcode><![CDATA['. $this->zipcode .']]></zipcode>
479
  <city><![CDATA['. $this->city .']]></city>
176
  $invoice->firstname = $rowThree['firstname']; // Your customers contact name
177
  $invoice->lastname = $rowThree['lastname']; // Your customers contact name
178
  $invoice->email = $rowOne['customer_email']; // Your customers emailaddress (invoice will be sent here)
179
+ $invoice->phone = $rowOne['telephone'];
180
  $invoice->address = $rowThree['street']; // Self-explanatory
181
  $invoice->zipcode = $rowThree['postcode']; // Self-explanatory
182
  $invoice->city = $rowThree['city']; // Self-explanatory
299
  'code' => $productcode,
300
  'description' => "[".$arrData[$i]['sku']."] ".trim($arrData[$i]['name']) . $varDescription,
301
  'price' => $arrData[$i]['base_price']*100,
302
+ //'price_incl' => ((($arrData[$i]['base_price']*$arrData[$i]['qty_ordered'])+$arrData[$i]['tax_amount'])/$arrData[$i]['qty_ordered'])*100,
303
+ 'price_incl' => round((($arrData[$i]['base_price']*$arrData[$i]['qty_ordered'])+$arrData[$i]['tax_amount'])/$arrData[$i]['qty_ordered'])*100,
304
  'price_vat' => ($arrData[$i]['tax_amount']/$arrData[$i]['qty_ordered'])*100,
305
  'vatpercentage' => trim(number_format($arrData[$i]['tax_percent'],2,'.', ''))*100,
306
  'discount' => trim(number_format($arrData[$i]['base_discount_amount'], 2, '.', '')/$arrData[$i]['base_price'])*100,
319
  'price' => $rowOne['shipping_amount']*100,
320
  'price_incl' => $rowOne['shipping_incl_tax']*100,
321
  'price_vat' => $rowOne['shipping_tax_amount']*100,
322
+ 'vatpercentage' => round(($rowOne['shipping_tax_amount']/$rowOne['shipping_amount'])*100)*100,
323
  'discount' => 0,
324
  'quantity' => 100,
325
  'categories' => 'shipping'
470
  <login mode="newInvoice">
471
  <username><![CDATA['.$this->username.']]></username>
472
  <password><![CDATA['.$this->password.']]></password>
473
+ <identifier><![CDATA[Magento_1.0.9]]></identifier>
474
  </login>
475
  <invoice>
476
  <companyname><![CDATA['. $this->companyname .']]></companyname>
477
  <firstname><![CDATA['. $this->firstname .']]></firstname>
478
  <lastname><![CDATA['. $this->lastname .']]></lastname>
479
  <email><![CDATA['. $this->email .']]></email>
480
+ <phone><![CDATA['. $this->phone .']]></phone>
481
  <address><![CDATA['. $this->address .']]></address>
482
  <zipcode><![CDATA['. $this->zipcode .']]></zipcode>
483
  <city><![CDATA['. $this->city .']]></city>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Qinvoice_Connect</name>
4
- <version>1.0.8</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Connects to q-invoice for sending invoices.</summary>
10
  <description>Manage your financial adminstration with q-invoice. All orders are invoiced through q-invoice and automatically added to your administration.</description>
11
- <notes>Added delivery address fields: company-, first and lastname</notes>
12
  <authors><author><name>Casper Mekel</name><user>caspermekel</user><email>info@q-invoice.com</email></author></authors>
13
- <date>2014-04-23</date>
14
- <time>10:22:17</time>
15
- <contents><target name="magecommunity"><dir name="Qinvoice"><file name="CHANGELOG" hash="0d74bdf10f2ba282635d709c28e1f236"/><dir name="Connect"><dir name="etc"><file name="config.xml" hash="7d3b9ce125aebb532dc6bd6fb1453665"/><file name="system.xml" hash="83e6dd86e5488715edb32c180cfbf35c"/></dir><dir name="Helper"><file name="Data.php" hash="ccb4b09674319e8b20e9c06a94adfa38"/></dir><dir name="Model"><dir name="Order"><file name="Observer.php" hash="6faeb8b3c05a693aa69e41717335d60c"/></dir><dir name="Source"><file name="Invoice.php" hash="4661f369f7e116fd761e5fffac9efeaf"/><file name="Method.php" hash="ac6891fc7e403250b24f5b0f2d6199bc"/><file name="Relation.php" hash="89ab031937b846ab5f0bcac7ccaa31b7"/><file name="Trigger.php" hash="e65427cc9773baaedae2b3897c7bf28a"/></dir></dir><file name="readme.txt" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Qinvoice_Connect.xml" hash="fbedefa4e926092705c6941ad28f51f8"/></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.6.0.0</min><max>1.8.0</max></package><extension><name>curl</name><min>5.1</min><max>6.0</max></extension></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Qinvoice_Connect</name>
4
+ <version>1.0.9</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Connects to q-invoice for sending invoices.</summary>
10
  <description>Manage your financial adminstration with q-invoice. All orders are invoiced through q-invoice and automatically added to your administration.</description>
11
+ <notes>Updated dependencies</notes>
12
  <authors><author><name>Casper Mekel</name><user>caspermekel</user><email>info@q-invoice.com</email></author></authors>
13
+ <date>2014-05-08</date>
14
+ <time>10:00:54</time>
15
+ <contents><target name="magecommunity"><dir name="Qinvoice"><file name="CHANGELOG" hash="0d74bdf10f2ba282635d709c28e1f236"/><dir name="Connect"><dir name="etc"><file name="config.xml" hash="7d3b9ce125aebb532dc6bd6fb1453665"/><file name="system.xml" hash="83e6dd86e5488715edb32c180cfbf35c"/></dir><dir name="Helper"><file name="Data.php" hash="ccb4b09674319e8b20e9c06a94adfa38"/></dir><dir name="Model"><dir name="Order"><file name="Observer.php" hash="d06521f2a8b374f7f71f8e1b7e37c4e6"/></dir><dir name="Source"><file name="Invoice.php" hash="4661f369f7e116fd761e5fffac9efeaf"/><file name="Method.php" hash="ac6891fc7e403250b24f5b0f2d6199bc"/><file name="Relation.php" hash="89ab031937b846ab5f0bcac7ccaa31b7"/><file name="Trigger.php" hash="e65427cc9773baaedae2b3897c7bf28a"/></dir></dir><file name="readme.txt" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Qinvoice_Connect.xml" hash="fbedefa4e926092705c6941ad28f51f8"/></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.6.0.0</min><max>1.8</max></package><extension><name>curl</name><min>5.1</min><max>6.0</max></extension></required></dependencies>
18
  </package>