Qinvoice_Connect - Version 2.1.2

Version Notes

Fixed bug

Release Info

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

Code changes from version 2.1.1 to 2.1.2

Files changed (6) hide show

app/code/community/Qinvoice/CHANGELOG +6 -2
app/code/community/Qinvoice/Connect/Model/Order/Observer.php +66 -46
app/code/community/Qinvoice/Connect/Model/Rewrite/Order.php +4 -41
app/code/community/Qinvoice/Connect/etc/config.xml +5 -5
app/code/community/Qinvoice/Connect/etc/config_old.xml +95 -0
package.xml +5 -5

app/code/community/Qinvoice/CHANGELOG CHANGED Viewed

	@@ -1,9 +1,13 @@
1	CHANGELOG
2






3	v2.0.1
4	- Added 'On complete' trigger
5	- - Added
6	-
7
8	v1.1.4 - 2015/05/05
9	- Updated for use with API v1.2 (backwards compatible with v1.1)


1	CHANGELOG
2
3	+ v2.1.2
4	+ - Fixed bug
5	+
6	+ v2.1.1
7	+ - Added support for updating stock
8	+
9	v2.0.1
10	- Added 'On complete' trigger


11
12	v1.1.4 - 2015/05/05
13	- Updated for use with API v1.2 (backwards compatible with v1.1)

app/code/community/Qinvoice/Connect/Model/Order/Observer.php CHANGED Viewed

@@ -8,57 +8,60 @@ class Qinvoice_Connect_Model_Order_Observer
+                }
             //
                 public function qinvoiceCall(){
-            -
                    if(Mage::app()->getRequest()->getParam('qc')){
-            -
                        $data = explode("|", Mage::app()->getRequest()->getParam('qc_data'));
-            -
                        $string = false;
-            -
                        //print_r($data);
-            -
                        foreach($data as $d){
-            -
                            $values = explode("=", $d);
-            -
                            switch($values[0]){
-            -
                                case 'check':
-            -
                                    $check = $values[1];
-            -
                                break;
-            -
                                default:
-            -
                                    if($string != false){
-            -
                                        $string .= '|';
-            -
                                    }
-            -
                                    $string .= $values[0] .'='. $values[1];
-            -
                                    $params[$values[0]] = $values[1];
-            -
                                break;
-            -
                            }
-            -
-            -
                        }
-            -
-            -
                        $secret = Mage::getStoreConfig('invoice_options/invoice/webshop_secret','default');
-            -
                        if(md5($string.$secret) != $check){
-            -
                            exit('Incorrect checksum. Check your secret key.');
-            -
                            return false;
-            -
                        }
-            -
                        switch(Mage::app()->getRequest()->getParam('qc')){
-            -
                            case 'test':
-            -
                                echo 'test ok';
-            -
                            break;
-            -
                            case 'stock':
-            -
                                echo $this->updateStock($params);
-            -
                            break;
-            -
                            case 'export':
-            -
                                echo $this->exportCatalog($params);
-            -
                            break;
-            -
                            case 'stores':
-            -
                                echo $this->listStores();
-            -
                            break;
+                        }
-            -
                        exit();
+                    }
+                }
                 public function updateStock($params){
@@ -194,9 +197,10 @@ class Qinvoice_Connect_Model_Order_Observer
                     if($invoice_trigger == 'order'){
                         $this->createInvoiceForQinvoice($order->getId(), false);
-            -
                    }else{
-            -
                        return true;
+                    }
+                }
                 public function sendOnPayment($observer){
@@ -210,9 +214,25 @@ class Qinvoice_Connect_Model_Order_Observer
                     if($invoice_trigger == 'payment'){
                         $this->createInvoiceForQinvoice($order_ids[0], true);
-            -
                    }else{
-            -
                        return true;
-            -
                    }
+                }
                 public function createInvoiceForQinvoice($varOrderID,$ifPaid = false)
+                {
@@ -659,7 +679,7 @@ class qinvoice{
                                     <login mode="newInvoice">
                                         <username><![CDATA['.$this->username.']]></username>
                                         <password><![CDATA['.$this->password.']]></password>
-            -
                                        <identifier><![CDATA[Magento_1.1.2]]></identifier>
                                     </login>
                                     <invoice>
                                         <companyname><![CDATA['. $this->companyname .']]></companyname>


8	}
9	//
10	public function qinvoiceCall(){

11
12	+ if(Mage::app()->getRequest()->getParam('qc') > ''){
13
14	+ if(in_array(Mage::app()->getRequest()->getParam('qc'), array('test','stock','export','stores'))){
15
16	+ $data = explode("\|", Mage::app()->getRequest()->getParam('qc_data'));



17
18	+ $string = false;
19	+ //print_r($data);
20	+ foreach($data as $d){
21	+ $values = explode("=", $d);










22
23	+ switch($values[0]){
24	+ case 'check':
25	+ $check = $values[1];
26	+ break;
27	+ default:
28	+ if($string != false){
29	+ $string .= '\|';
30	+ }
31	+ $string .= $values[0] .'='. $values[1];
32	+ $params[$values[0]] = $values[1];
33	+ break;
34	+ }
35	+
36	+ }
37
38	+
39	+ $secret = Mage::getStoreConfig('invoice_options/invoice/webshop_secret','default');


40
41	+ if(md5($string.$secret) != $check){
42	+ exit('Incorrect checksum. Check your secret key.');
43	+ return false;
44	+ }
45
46













47
48	+ switch(Mage::app()->getRequest()->getParam('qc')){
49	+ case 'test':
50	+ echo 'test ok';
51	+ break;
52	+ case 'stock':
53	+ echo $this->updateStock($params);
54	+ break;
55	+ case 'export':
56	+ echo $this->exportCatalog($params);
57	+ break;
58	+ case 'stores':
59	+ echo $this->listStores();
60	+ break;
61	+
62	+ }
63	+ exit();
64	}

65	}
66	}
67	public function updateStock($params){

197
198	if($invoice_trigger == 'order'){
199	$this->createInvoiceForQinvoice($order->getId(), false);


200	}
201	+ //else{
202	+ // return true;
203	+ // }
204	}
205
206	public function sendOnPayment($observer){

214
215	if($invoice_trigger == 'payment'){
216	$this->createInvoiceForQinvoice($order_ids[0], true);
217	+ }
218	+
219	+ // else{
220	+ // return true;
221	+ // }
222	+ }
223	+
224	+ public function orderStatusChange($observer){
225	+
226	+ // print_r($event);
227	+ $event = $observer->getEvent();
228	+ $order = $event->getOrder();
229	+
230	+ $invoice_trigger = Mage::getStoreConfig('invoice_options/invoice/invoice_trigger');
231	+ if($order->getState() == Mage_Sales_Model_Order::STATE_COMPLETE && $invoice_trigger == 'complete'){
232	+ $this->createInvoiceForQinvoice($order->getId(), true);
233	+ }
234	+ // exit();
235	+
236	}
237	public function createInvoiceForQinvoice($varOrderID,$ifPaid = false)
238	{

679	<login mode="newInvoice">
680	<username><![CDATA['.$this->username.']]></username>
681	<password><![CDATA['.$this->password.']]></password>
682	+ <identifier><![CDATA[Magento_2.1.2]]></identifier>
683	</login>
684	<invoice>
685	<companyname><![CDATA['. $this->companyname .']]></companyname>

app/code/community/Qinvoice/Connect/Model/Rewrite/Order.php CHANGED Viewed

@@ -23,49 +23,12 @@ class Qinvoice_Connect_Model_Rewrite_Order extends Mage_Sales_Model_Order{
             	        $history->setIsCustomerNotified($isCustomerNotified); // for backwards compatibility
+            	    }
-            -
            	    Mage::log("Store ID: ". $this->getStoreId());
-            -
-            -
            	    $varActionPath = 'invoice_options/invoice/invoice_trigger';
-            -
                    $trigger = Mage::getStoreConfig($varActionPath,$this->getStoreId());
-            -
-            -
                    Mage::log("Config: ". $trigger);
-            -
-            -
-            -
            	    // GETTING TRIGGER SETTING
-            -
                    $db = Mage::getSingleton('core/resource')->getConnection('core_write');
-            -
                    $varPath = 'invoice_options/invoice/api_username';
-            -
                    $prefix = Mage::getConfig()->getTablePrefix();
-            -
                    $resultTwo = $db->query("SELECT value FROM {$prefix}core_config_data WHERE path LIKE '".$varPath."'");
-            -
                    $rowTwo = $resultTwo->fetch(PDO::FETCH_ASSOC);
-            -
                    $varOnOrder = $rowTwo['value'];
-            -
-            -
                    if($varOnOrder == 'complete' && $order->getState() == Mage_Sales_Model_Order::STATE_COMPLETE){
-            -
                        $this->createInvoiceForQinvoice($order->getId(), false);
-            -
                    }else{
-            -
                        return true;
-            -
                    }
-            -
-            -
            	    switch($state){
-            -
            	    	case 'complete': // shipped?
-            -
            	    		if($trigger == 'complete'){
-            -
            	    			// send request
-            -
            	    		}
-            -
            	    	break;
-            -
            	    	case 'processing': // after payment?
-            -
            	    		if($trigger == 'payment'){
-            -
            	    			// send request
-            -
            	    		}
-            -
            	    		// update invoice
-            -
            	    	break;
-            -
            	    	case 'new': // new order
-            -
            	    		if($trigger == 'order'){
-            -
            	    			// send request
-            -
            	    		}
-            -
            	    	break;
-            -
            	    }
             	    Mage::dispatchEvent('qinvoice_connect_order_status_change', array('order' => $this, 'state' => $state, 'status' => $status, 'comment' => $comment, 'isCustomerNotified' => $isCustomerNotified));
-            -
            	    Mage::log("Qinvoice_Connect_Model_Rewrite_Order Changing order to STATE ".$state." STATUS ".$status);
             	    return $this;
+            	}
+            }

             	        $history->setIsCustomerNotified($isCustomerNotified); // for backwards compatibility
+            	    }
+            +
            	 	// echo 'hier';
             	    Mage::dispatchEvent('qinvoice_connect_order_status_change', array('order' => $this, 'state' => $state, 'status' => $status, 'comment' => $comment, 'isCustomerNotified' => $isCustomerNotified));
+            +
            	    // Mage::log("Qinvoice_Connect_Model_Rewrite_Order Changing order to STATE ".$state." STATUS ".$status);
+            +
+            +
            	    // exit('exit');
             	    return $this;
+            	}
+            }

app/code/community/Qinvoice/Connect/etc/config.xml CHANGED Viewed

	@@ -3,7 +3,7 @@
3	<config>
4	<modules>
5	<Qinvoice_Connect>
6	- <version>2.1.1</version>
7	</Qinvoice_Connect>
8	</modules>
9	<global>
	@@ -39,11 +39,11 @@
39	</controller_front_init_before>
40	<qinvoice_connect_order_status_change>
41	<observers>
42	- <~~qinvoice_connect_model_rewrite~~>
43	<type>singleton</type>
44	- <class>~~modelrewrite~~/~~observer~~</class>
45	- <method>~~changeStateOrder~~</method>
46	- </~~qinvoice_connect_model_rewrite~~>
47	</observers>
48	</qinvoice_connect_order_status_change>
49


3	<config>
4	<modules>
5	<Qinvoice_Connect>
6	+ <version>2.1.2</version>
7	</Qinvoice_Connect>
8	</modules>
9	<global>

39	</controller_front_init_before>
40	<qinvoice_connect_order_status_change>
41	<observers>
42	+ <connect>
43	<type>singleton</type>
44	+ <class>invoice/order_observer</class>
45	+ <method>orderStatusChange</method>
46	+ </connect>
47	</observers>
48	</qinvoice_connect_order_status_change>
49

app/code/community/Qinvoice/Connect/etc/config_old.xml ADDED Viewed

	@@ -0,0 +1,95 @@


1	+ <?xml version="1.0"?>
2	+ <!-- app/code/local/Qinvoice/Connect/etc/config.xml -->
3	+ <config>
4	+ <modules>
5	+ <Qinvoice_Connect>
6	+ <version>2.1.1</version>
7	+ </Qinvoice_Connect>
8	+ </modules>
9	+ <global>
10	+ <blocks>
11	+ <invoice>
12	+ <class>Qinvoice_Connect_Block</class>
13	+ </invoice>
14	+ <invoice_adminhtml>
15	+ <class>Qinvoice_Connect_Block_Adminhtml</class>
16	+ </invoice_adminhtml>
17	+ </blocks>
18	+ <models>
19	+ <invoice>
20	+ <class>Qinvoice_Connect_Model</class>
21	+ </invoice>
22	+ <sales>
23	+ <rewrite>
24	+ <order>Qinvoice_Connect_Model_Rewrite_Order</order>
25	+ </rewrite>
26	+ </sales>
27	+ <modelrewrite>
28	+ <class>Qinvoice_Connect_Model_Rewrite</class>
29	+ </modelrewrite>
30	+ </models>
31	+ <events>
32	+ <controller_front_init_before>
33	+ <observers>
34	+ <connect>
35	+ <class>invoice/order_observer</class>
36	+ <method>qinvoiceCall</method>
37	+ </connect>
38	+ </observers>
39	+ </controller_front_init_before>
40	+ <qinvoice_connect_order_status_change>
41	+ <observers>
42	+ <connect>
43	+ <class>invoice/order_observer</class>
44	+ <method>orderStatusChange</method>
45	+ </connect>
46	+ </observers>
47	+ </qinvoice_connect_order_status_change>
48	+
49	+ <sales_order_place_after>
50	+ <observers>
51	+ <connect>
52	+ <class>invoice/order_observer</class>
53	+ <method>sendOnOrder</method>
54	+ </connect>
55	+ </observers>
56	+ </sales_order_place_after>
57	+
58	+ <sales_order_payment_pay>
59	+ <observers>
60	+ <connect>
61	+ <class>invoice/order_observer</class>
62	+ <method>sendOnPayment</method>
63	+ </connect>
64	+ </observers>
65	+ </sales_order_payment_pay>
66	+ </events>
67	+ <helpers>
68	+ <invoice>
69	+ <class>Qinvoice_Connect_Helper</class>
70	+ </invoice>
71	+ </helpers>
72	+ </global>
73	+ <adminhtml>
74	+ <acl>
75	+ <resources>
76	+ <admin>
77	+ <children>
78	+ <system>
79	+ <children>
80	+ <config>
81	+ <children>
82	+ <invoice_options>
83	+ <title>Store Hello World Module Section</title>
84	+ </invoice_options>
85	+ </children>
86	+ </config>
87	+ </children>
88	+ </system>
89	+ </children>
90	+ </admin>
91	+ </resources>
92	+ </acl>
93	+ </adminhtml>
94	+
95	+ </config>

package.xml CHANGED Viewed

	@@ -1,18 +1,18 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Qinvoice_Connect</name>
4	- <version>2.1.1</version>
5	<stability>stable</stability>
6	<license>GPL</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>Automatically generate and send PDF invoices for every order to your customers through q-invoice.com</summary>
10	<description>Invoices can be generated upon a successful payment or order and will be added to your administration. Q-invoice offers you the freedom to run multiple webshops or venues but still have your bookkeeping together at one place. Generate invoices in a layout of your choosing for maximal recognition, upload bankstatements and process payment with the click of your mouse. www.q-invoice.com</description>
11	- <notes>Fixed ~~issue with multiple products same SKU, different custom option~~</notes>
12	<authors><author><name>Casper Mekel</name><user>caspermekel</user><email>info@q-invoice.com</email></author></authors>
13	- <date>2016-10-06</date>
14	- <time>16:56:24</time>
15	- <contents><target name="magecommunity"><dir name="Qinvoice"><file name="CHANGELOG" hash="~~f3fe0ee8957ad7362fe0961114678243~~"/><dir name="Connect"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Webshopsecret.php" hash="2157af67cdcf51307bde5efe5cee46d2"/></dir></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="ccb4b09674319e8b20e9c06a94adfa38"/></dir><dir name="Model"><dir name="Order"><file name="Observer.Boerdereike.php" hash="141eebc8865ff9c7e231d85df1432e96"/><file name="Observer.max4home.php" hash="1f9b754b2184c0079a0d53ecc2d3fdd8"/><file name="Observer.php" hash="~~b7828acc3cf5bef0f76e74a098e56255~~"/></dir><dir name="Rewrite"><file name="Observer.php" hash="769e4618f69697b8e3ccddbb9b446fea"/><file name="Order.php" hash="~~a56c5c21b08c783b2a1435d21d0b2d40~~"/></dir><dir name="Source"><file name="Attribute.php" hash="72f35ffb8cd873d2c5e1e448ff4bf4e2"/><file name="Invoice.php" hash="4661f369f7e116fd761e5fffac9efeaf"/><file name="Method.php" hash="ac6891fc7e403250b24f5b0f2d6199bc"/><file name="Relation.php" hash="89ab031937b846ab5f0bcac7ccaa31b7"/><file name="Trigger.php" hash="366ba803beda9471e48d5d6da3baa20a"/></dir></dir><dir name="Module"><dir name="Block"><file name="Webshop_Secret_Renderer.php" hash="53039328186fd5c9fe15a3f55b2f8d16"/></dir><file name="Webshop_Secret_Renderer.php" hash="53039328186fd5c9fe15a3f55b2f8d16"/></dir><dir name="etc"><file name="config.xml" hash="~~46d4577f78a57d533c5292ab74dac0ec~~"/><file name="system.xml" hash="ed502b22f018d096417f47e62dbc31a8"/></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>7.0.0</max></php><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>2.1.2</version>
5	<stability>stable</stability>
6	<license>GPL</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>Automatically generate and send PDF invoices for every order to your customers through q-invoice.com</summary>
10	<description>Invoices can be generated upon a successful payment or order and will be added to your administration. Q-invoice offers you the freedom to run multiple webshops or venues but still have your bookkeeping together at one place. Generate invoices in a layout of your choosing for maximal recognition, upload bankstatements and process payment with the click of your mouse. www.q-invoice.com</description>
11	+ <notes>Fixed bug</notes>
12	<authors><author><name>Casper Mekel</name><user>caspermekel</user><email>info@q-invoice.com</email></author></authors>
13	+ <date>2016-10-13</date>
14	+ <time>20:01:49</time>
15	+ <contents><target name="magecommunity"><dir name="Qinvoice"><file name="CHANGELOG" hash="a5b219d5eacdccb828a227a4467afa46"/><dir name="Connect"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Webshopsecret.php" hash="2157af67cdcf51307bde5efe5cee46d2"/></dir></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="ccb4b09674319e8b20e9c06a94adfa38"/></dir><dir name="Model"><dir name="Order"><file name="Observer.Boerdereike.php" hash="141eebc8865ff9c7e231d85df1432e96"/><file name="Observer.max4home.php" hash="1f9b754b2184c0079a0d53ecc2d3fdd8"/><file name="Observer.php" hash="70c3b68728422bd55f821a6c66db6339"/></dir><dir name="Rewrite"><file name="Observer.php" hash="769e4618f69697b8e3ccddbb9b446fea"/><file name="Order.php" hash="1206763b6090a7136fe869b474935c51"/></dir><dir name="Source"><file name="Attribute.php" hash="72f35ffb8cd873d2c5e1e448ff4bf4e2"/><file name="Invoice.php" hash="4661f369f7e116fd761e5fffac9efeaf"/><file name="Method.php" hash="ac6891fc7e403250b24f5b0f2d6199bc"/><file name="Relation.php" hash="89ab031937b846ab5f0bcac7ccaa31b7"/><file name="Trigger.php" hash="366ba803beda9471e48d5d6da3baa20a"/></dir></dir><dir name="Module"><dir name="Block"><file name="Webshop_Secret_Renderer.php" hash="53039328186fd5c9fe15a3f55b2f8d16"/></dir><file name="Webshop_Secret_Renderer.php" hash="53039328186fd5c9fe15a3f55b2f8d16"/></dir><dir name="etc"><file name="config.xml" hash="f069ed25a278c173cb2223e1303dfd22"/><file name="config_old.xml" hash="dcd8c91d7d5e48154ebe900336d13cab"/><file name="system.xml" hash="ed502b22f018d096417f47e62dbc31a8"/></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>7.0.0</max></php><extension><name>curl</name><min>5.1</min><max>6.0</max></extension></required></dependencies>
18	</package>