Revert "Merge pull request #421 from Billmate/WPM-126"

This reverts commit 82cd5ef, reversing changes made to ec592ea.
Billmate · Mar 30, 2020 · 81d452f · 81d452f
1 parent 5b9594d
commit 81d452f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/src/class-billmate-common.php b/src/class-billmate-common.php
@@ -182,11 +182,6 @@ public function page_init() {
 			'billmate_common_activateonstatus',
 			array($this, 'sanitize')
 		);
-                register_setting(
-			'billmate_common',
-                        'billmate_common_cancelonstatus',
-                        array($this, 'sanitize')
-                );
 		register_setting(
 			'billmate_common',
 			'billmate_common_enable_overlay',
@@ -240,13 +235,6 @@ public function page_init() {
 			'billmate-settings',
 			'setting_credentials'
 		);
-                add_settings_field(
-                    'billmate_common_cancelonstatus',
-                    __('Enable crediting/cancelling of payments in Billmate Online', 'billmate'),
-                    array($this, 'cancelonstatus_callback'),
-                    'billmate-settings',
-                    'setting_credentials'
-                );
 		add_settings_field(
 			'billmate_common_logo',
 			__('Logo to be displayed in the invoice', 'billmate'),
@@ -286,16 +274,6 @@ public function activateonstatus_callback() {
 		echo '</select>';
 	}
 
-    public function cancelonstatus_callback() {
-        $value    = get_option('billmate_common_cancelonstatus', '');
-        $inactive = ($value == 'inactive') ? 'selected="selected"' : '';
-        $active   = ($value == 'active') ? 'selected="selected"' : '';
-        echo '<select name="billmate_common_cancelonstatus" id="billmate_common_cancelonstatus">';
-        echo '<option value="inactive"' . $inactive . '>' . __('Inactive', 'billmate') . '</option>';
-        echo '<option value="active"' . $active . '>' . __('Active', 'billmate') . '</option>';
-        echo '</select>';
-    }
-
     public function getaddress_callback()
     {
         $value = get_option('billmate_common_getaddress','');
@@ -449,4 +427,4 @@ public function verify_credentials() {
 		echo json_encode($response);
 		wp_die();
 	}
-}
+}
diff --git a/src/commonfunctions.php b/src/commonfunctions.php
@@ -56,7 +56,7 @@ function cancel_billmate_order($order_id, $action = false){
     $order = wc_get_order($order_id);
     $method = $order->get_payment_method();
     if (strpos(strtolower($method), 'billmate') !== false) {
-        if (get_option('billmate_common_cancelonstatus') == 'active') {
+        if (get_option('billmate_common_activateonstatus') == 'active') {
             $number = get_post_meta($order_id, 'billmate_invoice_id', true);
             $hasBeenActivated = get_post_meta($order_id, 'order_has_been_activated', true);
             if ($hasBeenActivated == "") {
@@ -165,7 +165,7 @@ function credit_billmate_order($order_id, $action = false, $isCancel = false){
             }
         }
         if (!$isPartial) {
-            if (get_option('billmate_common_cancelonstatus') == 'active') {
+            if (get_option('billmate_common_activateonstatus') == 'active') {
                 if ($number !== null) {
                     $paymentMethod = get_post_meta($order_id, '_payment_method');
                     $methodClass = false;

diff --git a/src/languages/billmate-sv_SE.mo b/src/languages/billmate-sv_SE.mo
diff --git a/src/languages/billmate-sv_SE.po b/src/languages/billmate-sv_SE.po
@@ -17,9 +17,6 @@ msgstr ""
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPath-1: ..\n"
 
-msgid "Enable crediting/cancelling of payments in Billmate Online"
-msgstr "Aktivera kreditering/markulering av betalningar i Billmate Online"
-
 msgid "Error: Can't cancel Billmate invoice %s, Unknown Method."
 msgstr "Fel: Kan inte avbryta beställningen Billmate faktura %s, okänd metod."