Qinvoice_Connect - Version 1.0.8

Version Notes

Added delivery address fields: company-, first and lastname

Download this release

Release Info

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


Code changes from version 1.0.7 to 1.0.8

Files changed (4) hide show
  1. app/code/community/Qinvoice/CHANGELOG +3 -0
  2. app/code/community/Qinvoice/Connect/Model/Order/Observer.php +10 -1
  3. app/code/community/Qinvoice/Connect/etc/config.xml +1 -1
  4. package.xml +5 -5
app/code/community/Qinvoice/CHANGELOG CHANGED
@@ -1,5 +1,8 @@
1
  CHANGELOG
2
 
 
 
 
3
  v1.0.6 - 2014/01/22
4
  - Removed double description lines
5
 
1
  CHANGELOG
2
 
3
+ v1.0.8 - 2014/04/08
4
+ - Fixed type and shipping VAT
5
+
6
  v1.0.6 - 2014/01/22
7
  - Removed double description lines
8
 
app/code/community/Qinvoice/Connect/Model/Order/Observer.php CHANGED
@@ -186,6 +186,9 @@ class Qinvoice_Connect_Model_Order_Observer
186
  $resultFour = $db->query("SELECT firstname, lastname, company, email, telephone, street, city, region, postcode, country_id FROM {$prefix}sales_flat_order_address WHERE entity_id='".$rowOne['shipping_address_id']."'");
187
  $rowFour = $resultFour->fetch(PDO::FETCH_ASSOC);
188
 
 
 
 
189
  $invoice->delivery_address = $rowFour['street']; // Self-explanatory
190
  $invoice->delivery_zipcode = $rowFour['postcode']; // Self-explanatory
191
  $invoice->delivery_city = $rowFour['city']; // Self-explanatory
@@ -312,7 +315,7 @@ class Qinvoice_Connect_Model_Order_Observer
312
  'code' => '',
313
  'description' => trim($rowOne['shipping_description']),
314
  'price' => $rowOne['shipping_amount']*100,
315
- 'price_inl' => $rowOne['shipping_amount']*100,
316
  'price_vat' => $rowOne['shipping_tax_amount']*100,
317
  'vatpercentage' => ($rowOne['shipping_tax_amount']/$rowOne['shipping_amount'])*100,
318
  'discount' => 0,
@@ -369,6 +372,9 @@ class qinvoice{
369
  public $zipcode;
370
  public $city;
371
  public $country;
 
 
 
372
  public $delivery_address;
373
  public $delivery_zipcode;
374
  public $delivery_city;
@@ -473,6 +479,9 @@ class qinvoice{
473
  <city><![CDATA['. $this->city .']]></city>
474
  <country><![CDATA['. $this->country .']]></country>
475
 
 
 
 
476
  <delivery_address><![CDATA['. $this->delivery_address .']]></delivery_address>
477
  <delivery_zipcode><![CDATA['. $this->delivery_zipcode .']]></delivery_zipcode>
478
  <delivery_city><![CDATA['. $this->delivery_city .']]></delivery_city>
186
  $resultFour = $db->query("SELECT firstname, lastname, company, email, telephone, street, city, region, postcode, country_id FROM {$prefix}sales_flat_order_address WHERE entity_id='".$rowOne['shipping_address_id']."'");
187
  $rowFour = $resultFour->fetch(PDO::FETCH_ASSOC);
188
 
189
+ $invoice->delivery_companyname = $rowFour['delivery_company']; // Your customers company name
190
+ $invoice->delivery_firstname = $rowFour['delivery_firstname']; // Your customers contact name
191
+ $invoice->delivery_lastname = $rowFour['delivery_lastname']; // Your customers contact name
192
  $invoice->delivery_address = $rowFour['street']; // Self-explanatory
193
  $invoice->delivery_zipcode = $rowFour['postcode']; // Self-explanatory
194
  $invoice->delivery_city = $rowFour['city']; // Self-explanatory
315
  'code' => '',
316
  'description' => trim($rowOne['shipping_description']),
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,
372
  public $zipcode;
373
  public $city;
374
  public $country;
375
+ public $delivery_companyname;
376
+ public $delivery_firstname;
377
+ public $delivery_lastname;
378
  public $delivery_address;
379
  public $delivery_zipcode;
380
  public $delivery_city;
479
  <city><![CDATA['. $this->city .']]></city>
480
  <country><![CDATA['. $this->country .']]></country>
481
 
482
+ <delivery_companyname><![CDATA['. $this->delivery_companyname .']]></delivery_companyname>
483
+ <delivery_firstname><![CDATA['. $this->delivery_firstname .']]></delivery_firstname>
484
+ <delivery_lastname><![CDATA['. $this->delivery_lastname .']]></delivery_lastname>
485
  <delivery_address><![CDATA['. $this->delivery_address .']]></delivery_address>
486
  <delivery_zipcode><![CDATA['. $this->delivery_zipcode .']]></delivery_zipcode>
487
  <delivery_city><![CDATA['. $this->delivery_city .']]></delivery_city>
app/code/community/Qinvoice/Connect/etc/config.xml CHANGED
@@ -3,7 +3,7 @@
3
  <config>
4
  <modules>
5
  <Qinvoice_Connect>
6
- <version>1.0.7</version>
7
  </Qinvoice_Connect>
8
  </modules>
9
  <global>
3
  <config>
4
  <modules>
5
  <Qinvoice_Connect>
6
+ <version>1.0.8</version>
7
  </Qinvoice_Connect>
8
  </modules>
9
  <global>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Qinvoice_Connect</name>
4
- <version>1.0.7</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>Minor bugfixes</notes>
12
  <authors><author><name>Casper Mekel</name><user>caspermekel</user><email>info@q-invoice.com</email></author></authors>
13
- <date>2014-03-29</date>
14
- <time>13:40:57</time>
15
- <contents><target name="magecommunity"><dir name="Qinvoice"><file name="CHANGELOG" hash="b13454004c420dfb97201b73d79598f9"/><dir name="Connect"><dir name="Helper"><file name="Data.php" hash="ccb4b09674319e8b20e9c06a94adfa38"/></dir><dir name="Model"><dir name="Order"><file name="Observer.php" hash="19880b506d22198d32a4a077d6322463"/></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><dir name="etc"><file name="config.xml" hash="51c977950c924bd644562f8883be1ac1"/><file name="system.xml" hash="83e6dd86e5488715edb32c180cfbf35c"/></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.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>