update readme + fix

Author: devSaa

README.md

@@ -16,12 +16,16 @@
    1. Название -- Банковской картой Visa/Mastercard; 
    2. Процессор -- Fondy;
 - Hа вкладке "Настройки" заполните:
-   1. ID аккаунта -- идентификатор мерчанта; 
-   2. Общий ключ -- секретный ключ мерчанта;
+   1. Merchant ID -- идентификатор мерчанта; 
+   2. Пароль -- секретный ключ мерчанта;
    3. Валюта -- валюта мерчанта;
+   4. Transaction method -- Продажа/hold
+   5. Статусы заказа
 
 5.Нажать кнопку "Создать";
 
+При выбраном режиме холдирования, списание средст происходит при смене "статуса заказа с замороженными средствами" на выбраный "статсу оплаченого заказа"
+
 
 ![Скриншот][1]
 ----

Screenshot_1.png

@@ -40,7 +40,7 @@ function fn_fondy_change_order_status(&$status_to, $status_from, $order_info, $f
         $currency_f = $processor_data['processor_params']['currency'];
     }
 
-    if ($processor_data['processor_params']['status_hold'] == $status_from && $status_to == 'P') {
+    if ($processor_data['processor_params']['status_hold'] == $status_from && $status_to == $processor_data['processor_params']['paid_order_status']) {
         $payment_data = [
             'order_id' => ($order_info['payment_info']['order_id']) ? $order_info['payment_info']['order_id'] : $order_info['payment_info']['fondy_order_id'],
             'currency' => $currency_f,

app/addons/fondy/func.php

@@ -26,8 +26,15 @@
 
     if ($response === true) {
         if ($mode == 'ok' && $body['order_status'] == 'approved') {
+
+            if ($order_info['status'] == $processor_data['processor_params']['paid_order_status'] && $processor_data['processor_params']['transaction_method'] == 'hold') {
+                $order_status = $processor_data['processor_params']['paid_order_status'];
+            } else {
+                $order_status = ($processor_data['processor_params']['transaction_method'] == 'hold') ? $processor_data['processor_params']['status_hold'] : $processor_data['processor_params']['paid_order_status'];
+            }
+
             $pp_response = [
-                'order_status' => ($processor_data['processor_params']['transaction_method'] == 'hold') ? $processor_data['processor_params']['status_hold'] : 'P',
+                'order_status' => $order_status,
                 'payment_id' => $body['payment_id'],
             ];
         } else {
@@ -43,7 +50,7 @@
         fn_redirect('/cart');
         exit();
     }
-    $pp_response = ['order_status' => ($processor_data['processor_params']['transaction_method'] == 'hold') ? $processor_data['processor_params']['status_hold'] : 'P'];
+    $pp_response = ['order_status' => ($processor_data['processor_params']['transaction_method'] == 'hold') ? $processor_data['processor_params']['status_hold'] : $processor_data['processor_params']['paid_order_status']];
     fn_finish_payment($order_id, $pp_response);
     fn_clear_cart($_SESSION['cart']);
     fn_redirect('/cart');

app/addons/fondy/payments/fondy.php

@@ -69,10 +69,22 @@
     </div>
 </div>
 
+<div class="control-group" id="row_paid_order_status">
+    <label class="control-label" for="paid_order_status">{__("addons.fondy.paid_order_status")}</label>
+    <div class="controls">
+        <select name="payment_data[processor_params][paid_order_status]" id="paid_order_status">
+            {foreach from=$statuses item="s" key="k"}
+                <option value="{$k}" {if $processor_params.paid_order_status == $k}selected="selected"{/if}>{$s}</option>
+            {/foreach}
+        </select>
+    </div>
+</div>
+
 <div class="control-group">
     <label class="control-label" for="currency">{__("addons.fondy.currency")}:</label>
     <div class="controls">
         <select name="payment_data[processor_params][currency]" id="currency">
+            <option value="shop_cur"{if $processor_params.currency == "shop_cur"} selected="selected"{/if}>{__("primary_currency")}</option>
             {foreach from=$currency item="s" key="k"}
                 <option value="{$k}" {if $processor_params.currency == $k}selected="selected"{/if}>{$k}</option>
             {/foreach}

design/backend/templates/addons/fondy/views/payments/components/cc_processors/fondy.tpl

@@ -52,4 +52,7 @@ msgctxt "Languages::addons.fondy.status_hold"
 msgid "Order status with hold funds"
 msgstr "Order status with hold funds"
 
+msgctxt "Languages::addons.fondy.paid_order_status"
+msgid "Paid order status"
+msgstr "Paid order status"
 

var/langs/en/addons/fondy.po

@@ -52,7 +52,7 @@ msgctxt "Languages::addons.fondy.status_hold"
 msgid "Статус заказа с замороженными средствами"
 msgstr "Статус заказа с замороженными средствами"
 
-
-
-
+msgctxt "Languages::addons.fondy.paid_order_status"
+msgid "Статус оплаченого заказа"
+msgstr "Статус оплаченого заказа"