Version Notes
Added configuration option for not setting invoices as paid
Download this release
Release Info
Developer | Komfortkasse |
Extension | Ltc_Komfortkasse |
Version | 1.7.7 |
Comparing to | |
See all releases |
Code changes from version 1.7.6 to 1.7.7
- app/code/community/Ltc/Komfortkasse/Helper/Komfortkasse.php +1 -1
- app/code/community/Ltc/Komfortkasse/Helper/Komfortkasse_Config.php +2 -2
- app/code/community/Ltc/Komfortkasse/Helper/Komfortkasse_Order.php +2 -3
- app/code/community/Ltc/Komfortkasse/etc/config.xml +2 -1
- app/code/community/Ltc/Komfortkasse/etc/system.xml +13 -1
- package.xml +5 -5
app/code/community/Ltc/Komfortkasse/Helper/Komfortkasse.php
CHANGED
@@ -8,7 +8,7 @@ require_once 'Komfortkasse_Order.php';
|
|
8 |
*/
|
9 |
class Komfortkasse
|
10 |
{
|
11 |
-
const PLUGIN_VER = '1.7.
|
12 |
const MAXLEN_SSL = 117;
|
13 |
const LEN_MCRYPT = 16;
|
14 |
|
8 |
*/
|
9 |
class Komfortkasse
|
10 |
{
|
11 |
+
const PLUGIN_VER = '1.7.7';
|
12 |
const MAXLEN_SSL = 117;
|
13 |
const LEN_MCRYPT = 16;
|
14 |
|
app/code/community/Ltc/Komfortkasse/Helper/Komfortkasse_Config.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
/**
|
4 |
* Komfortkasse
|
5 |
* Config Class
|
6 |
-
* @version 1.7.
|
7 |
class Komfortkasse_Config
|
8 |
{
|
9 |
const activate_export = 'payment/komfortkasse/activate_export';
|
@@ -29,7 +29,7 @@ class Komfortkasse_Config
|
|
29 |
const consider_creditnotes = 'payment/komfortkasse/consider_creditnotes';
|
30 |
const creditnotes_as_invoices = 'payment/komfortkasse/creditnotes_as_invoices';
|
31 |
const last_receipt_only = 'payment/komfortkasse/last_receipt_only';
|
32 |
-
|
33 |
|
34 |
/**
|
35 |
* Set Config.
|
3 |
/**
|
4 |
* Komfortkasse
|
5 |
* Config Class
|
6 |
+
* @version 1.7.7-Magento */
|
7 |
class Komfortkasse_Config
|
8 |
{
|
9 |
const activate_export = 'payment/komfortkasse/activate_export';
|
29 |
const consider_creditnotes = 'payment/komfortkasse/consider_creditnotes';
|
30 |
const creditnotes_as_invoices = 'payment/komfortkasse/creditnotes_as_invoices';
|
31 |
const last_receipt_only = 'payment/komfortkasse/last_receipt_only';
|
32 |
+
const set_invoices_paid = 'payment/komfortkasse/set_invoices_paid';
|
33 |
|
34 |
/**
|
35 |
* Set Config.
|
app/code/community/Ltc/Komfortkasse/Helper/Komfortkasse_Order.php
CHANGED
@@ -8,7 +8,7 @@
|
|
8 |
* status: data type according to the shop system
|
9 |
* delivery_ and billing_: _firstname, _lastname, _company, _street, _postcode, _city, _countrycode
|
10 |
* products: an Array of item numbers
|
11 |
-
* @version 1.7.
|
12 |
*/
|
13 |
$path = Mage::getModuleDir('', 'Ltc_Komfortkasse');
|
14 |
global $komfortkasse_order_extension;
|
@@ -446,8 +446,7 @@ class Komfortkasse_Order
|
|
446 |
if ($state == 'processing' || $state == 'closed' || $state == 'complete') {
|
447 |
|
448 |
// If there is already an invoice, update the invoice, not the order.
|
449 |
-
$
|
450 |
-
if ($invoiceColl->getSize() > 0) {
|
451 |
foreach ($order->getInvoiceCollection() as $invoice) {
|
452 |
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' invoice ' . $invoice->getIncrementId() . ' pay', null, 'komfortkasse.log');
|
453 |
$invoice->pay();
|
8 |
* status: data type according to the shop system
|
9 |
* delivery_ and billing_: _firstname, _lastname, _company, _street, _postcode, _city, _countrycode
|
10 |
* products: an Array of item numbers
|
11 |
+
* @version 1.7.7-Magento1
|
12 |
*/
|
13 |
$path = Mage::getModuleDir('', 'Ltc_Komfortkasse');
|
14 |
global $komfortkasse_order_extension;
|
446 |
if ($state == 'processing' || $state == 'closed' || $state == 'complete') {
|
447 |
|
448 |
// If there is already an invoice, update the invoice, not the order.
|
449 |
+
if (Komfortkasse_Config::getConfig(Komfortkasse_Config::set_invoices_paid, $order) && $order->getInvoiceCollection()->getSize() > 0) {
|
|
|
450 |
foreach ($order->getInvoiceCollection() as $invoice) {
|
451 |
Mage::log('Komfortkasse: update order ' . $order->getIncrementId() . ' invoice ' . $invoice->getIncrementId() . ' pay', null, 'komfortkasse.log');
|
452 |
$invoice->pay();
|
app/code/community/Ltc/Komfortkasse/etc/config.xml
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
<config>
|
4 |
<modules>
|
5 |
<Ltc_Komfortkasse>
|
6 |
-
<version>1.7.
|
7 |
</Ltc_Komfortkasse>
|
8 |
</modules>
|
9 |
<global>
|
@@ -63,6 +63,7 @@
|
|
63 |
<creditnotes_as_invoices>0</creditnotes_as_invoices>
|
64 |
<last_receipt_only>0</last_receipt_only>
|
65 |
<status_open_cod>processing</status_open_cod>
|
|
|
66 |
</komfortkasse>
|
67 |
</payment>
|
68 |
</default>
|
3 |
<config>
|
4 |
<modules>
|
5 |
<Ltc_Komfortkasse>
|
6 |
+
<version>1.7.7</version>
|
7 |
</Ltc_Komfortkasse>
|
8 |
</modules>
|
9 |
<global>
|
63 |
<creditnotes_as_invoices>0</creditnotes_as_invoices>
|
64 |
<last_receipt_only>0</last_receipt_only>
|
65 |
<status_open_cod>processing</status_open_cod>
|
66 |
+
<set_invoices_paid>1</set_invoices_paid>
|
67 |
</komfortkasse>
|
68 |
</payment>
|
69 |
</default>
|
app/code/community/Ltc/Komfortkasse/etc/system.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<!--
|
3 |
Komfortkasse
|
4 |
Magento Plugin - system.xml
|
5 |
-
@version 1.
|
6 |
<config>
|
7 |
<sections>
|
8 |
<payment>
|
@@ -230,6 +230,18 @@
|
|
230 |
<comment>Order state that should be set when a COD order was not paid.
|
231 |
</comment>
|
232 |
</status_cancelled_cod>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
233 |
<encryption translate="label">
|
234 |
<label>Encryption</label>
|
235 |
<frontend_type>text</frontend_type>
|
2 |
<!--
|
3 |
Komfortkasse
|
4 |
Magento Plugin - system.xml
|
5 |
+
@version 1.7.7-Magento */ -->
|
6 |
<config>
|
7 |
<sections>
|
8 |
<payment>
|
230 |
<comment>Order state that should be set when a COD order was not paid.
|
231 |
</comment>
|
232 |
</status_cancelled_cod>
|
233 |
+
<set_invoices_paid translate="label">
|
234 |
+
<label>Set invoices paid</label>
|
235 |
+
<frontend_type>select</frontend_type>
|
236 |
+
<source_model>adminhtml/system_config_source_enabledisable
|
237 |
+
</source_model>
|
238 |
+
<sort_order>500</sort_order>
|
239 |
+
<show_in_default>1</show_in_default>
|
240 |
+
<show_in_website>1</show_in_website>
|
241 |
+
<show_in_store>1</show_in_store>
|
242 |
+
<comment>When a paid order has invoices, also set invoices to paid (for all order types).
|
243 |
+
</comment>
|
244 |
+
</set_invoices_paid>
|
245 |
<encryption translate="label">
|
246 |
<label>Encryption</label>
|
247 |
<frontend_type>text</frontend_type>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Ltc_Komfortkasse</name>
|
4 |
-
<version>1.7.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://creativecommons.org/licenses/by-nd/4.0/">CC BY-ND 4.0</license>
|
7 |
<channel>community</channel>
|
@@ -13,11 +13,11 @@ Zusätzlich können automatische Zahlungserinnerungen versendet werden u
|
|
13 |

|
14 |
Es ist eine Anmeldung auf www.komfortkasse.eu erforderlich (kostenloses Paket verfügbar).
|
15 |
</description>
|
16 |
-
<notes>
|
17 |
<authors><author><name>Komfortkasse</name><user>komfortkasse</user><email>integration@komfortkasse.eu</email></author></authors>
|
18 |
-
<date>2017-05-
|
19 |
-
<time>
|
20 |
-
<contents><target name="magecommunity"><dir name="Ltc"><dir name="Komfortkasse"><dir name="Helper"><file name="Data.php" hash="318009cadcd1d50ac765412c9e5f418c"/><file name="Komfortkasse.php" hash="
|
21 |
<compatible/>
|
22 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
23 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Ltc_Komfortkasse</name>
|
4 |
+
<version>1.7.7</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://creativecommons.org/licenses/by-nd/4.0/">CC BY-ND 4.0</license>
|
7 |
<channel>community</channel>
|
13 |

|
14 |
Es ist eine Anmeldung auf www.komfortkasse.eu erforderlich (kostenloses Paket verfügbar).
|
15 |
</description>
|
16 |
+
<notes>Added configuration option for not setting invoices as paid</notes>
|
17 |
<authors><author><name>Komfortkasse</name><user>komfortkasse</user><email>integration@komfortkasse.eu</email></author></authors>
|
18 |
+
<date>2017-05-29</date>
|
19 |
+
<time>07:04:28</time>
|
20 |
+
<contents><target name="magecommunity"><dir name="Ltc"><dir name="Komfortkasse"><dir name="Helper"><file name="Data.php" hash="318009cadcd1d50ac765412c9e5f418c"/><file name="Komfortkasse.php" hash="418cdc54120dc250b0d7cf0b1f680655"/><file name="Komfortkasse_Config.php" hash="1d20b1615ae1399040ac01d3dcb65f2c"/><file name="Komfortkasse_Order.php" hash="fff07492fd53258f4986ba68aca8f46e"/></dir><dir name="Model"><file name="Encryptionoptions.php" hash="1fbe2ffc43cc3c1489688d20f4c8af11"/><file name="Observer.php" hash="5b616b6d3651df44f8297c732dc478bb"/></dir><dir name="controllers"><file name="MainController.php" hash="7f486ef186359e5b0be9a4ae00159a30"/></dir><dir name="etc"><file name="config.xml" hash="5dc4d86a918ff65e38b0916829bdbc47"/><file name="system.xml" hash="8365605d829c9207a21aeb71c5776a15"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Ltc_Komfortkasse.xml" hash="433066ef75047d9468dcea87888283d2"/></dir></target></contents>
|
21 |
<compatible/>
|
22 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
23 |
</package>
|