WordPress.org
Get WordPress

Plugin Directory

Changeset 2922988


Ignore:
Timestamp:
06/07/2023 03:57:44 PM (3 years ago)
Author:
lavedettemedia
Message:

Choose the type of form to display
Payment method takes currency into account

Location:
feexpay
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • feexpay/tags/1.0.0/admin/feexpay-settings.php

    r2893872 r2922988  
    3838        'desc_tip'    => true,
    3939    ),
     40    'form' => array(
     41        'title' => __('Type de formulaire', 'feexpay'),
     42        'type' => 'select',
     43        'options' => array(
     44            'ALL' => __('Tout', 'feexpay'),
     45            'CARD' => __('Uniquement Cartes bancaires', 'feexpay'),
     46            'MOBILE' => __('Uniquement Mobile Money', 'feexpay'),
     47        ),
     48        'default' => 'ALL',
     49        'desc_tip'    => true,
     50        'description' => __('Choisissez le type de formulaire que vous souhaitez afficher aux clients', 'kkiapay-woocommerce')
     51    ),
    4052    'token' => array(
    4153        'title' => __('API Key', 'feexpay'),

  • feexpay/tags/1.0.0/assets/js/invoke.js

    r2918280 r2922988  
    1212    return result;
    1313  }
     14
     15  // console.log(inputs)
    1416  const reference = makeid(8);
    1517  inputs.reference = makeid(8);
    … …  
    1921    : (inputs.mode = "LIVE");
    2022
    21   console.log(inputs)
    22   if (!inputs.theme) inputs.theme = 'primary';
     23  // console.log(inputs)
     24  // if (!inputs.theme) inputs.theme = 'primary';
    2325  event.preventDefault();
    2426  inputs.sdk = 'woocommerce';
    … …  
    3133    token:inputs.token,
    3234    mode: inputs.mode,
     35    currency: inputs.currency,
    3336    // callback:()=>{
    3437    //   // console.log("Paiment Effectuer")
    3538    // },
    3639    callback_url:inputs.callback,
    37     custom_id: inputs.reference
     40    custom_id: inputs.reference,
     41    case: inputs.form,
    3842  });
    3943  button.addEventListener('click', function (event) {

  • feexpay/tags/1.0.0/includes/class-wc-feexpay-gateway.php

    r2918280 r2922988  
    4242        $this->feexpay_config['key'] = $this->token;
    4343        $this->feexpay_config['key'] = $this->shop;
     44        $this->feexpay_config['currency'] = get_woocommerce_currency();
     45
    4446        $this->feexpay = new Feexpay\FeexpayClass($this->token, $this->shop, $sandbox=true);
    4547
    … …  
    8890    public function import_admin_scripts()
    8991    {
    90         wp_enqueue_script('jscolor', plugins_url('../assets/js/jscolor.js', __FILE__), [], 'v1', true);
    91         wp_enqueue_script('setup-admin-script', plugins_url('../assets/js/admin.js', __FILE__), [], 'v1', true);
     92//        wp_enqueue_script('jscolor', plugins_url('../assets/js/jscolor.js', __FILE__), [], 'v1', true);
     93//        wp_enqueue_script('setup-admin-script', plugins_url('../assets/js/admin.js', __FILE__), [], 'v1', true);
    9294    }
    9395
    … …  
    193195
    194196            if (($response->status == Status\STATUS::SUCCESS || $response->status == Status\STATUS::SUCCESSFUL) && $response->amount >= $order->get_total()) {
    195 
    196197                $order->update_status('completed');
    197198                $order->add_order_note(__('Payment was successful on feexpay', 'feexpay'));
    … …  
    208209                $customer_note .= __('Your payment has not been confirmed yet, so we have to put your order <strong>on-hold</strong> ', 'feexpay');
    209210                $customer_note .= __('If this persists, Please, contact us for information regarding this order.', 'feexpay');
    210 
    211211                $order->add_order_note($customer_note, 1);
    212212                wc_add_notice($customer_note, 'notice');
    … …  
    221221                $admin_note = __('Attention: New order has been placed on hold because of incorrect payment amount or currency. Please, look into it. <br>', 'feexpay');
    222222                $admin_note .= __('Amount paid: ' . $order->get_currency() . ' ' . $response->amount . ' <br> Order amount: ' . $order->get_order_currency() . ' ' . $order->order_total . ' <br> Reference: ' . sanitize_text_field($_GET['ref']), 'feexpay');
    223 
    224223                $order->add_order_note($customer_note, 1);
    225224                $order->add_order_note($admin_note);
    226225                wc_add_notice($customer_note, 'notice');
    227 
    228226                $woocommerce->cart->empty_cart();
    229227                wp_redirect($this->get_return_url($order));

  • feexpay/trunk/admin/feexpay-settings.php

    r2893869 r2922988  
    3838        'desc_tip'    => true,
    3939    ),
     40    'form' => array(
     41        'title' => __('Type de formulaire', 'feexpay'),
     42        'type' => 'select',
     43        'options' => array(
     44            'ALL' => __('Tout', 'feexpay'),
     45            'CARD' => __('Uniquement Cartes bancaires', 'feexpay'),
     46            'MOBILE' => __('Uniquement Mobile Money', 'feexpay'),
     47        ),
     48        'default' => 'ALL',
     49        'desc_tip'    => true,
     50        'description' => __('Choisissez le type de formulaire que vous souhaitez afficher aux clients', 'kkiapay-woocommerce')
     51    ),
    4052    'token' => array(
    4153        'title' => __('API Key', 'feexpay'),

  • feexpay/trunk/assets/js/invoke.js

    r2918279 r2922988  
    1212    return result;
    1313  }
     14
     15  // console.log(inputs)
    1416  const reference = makeid(8);
    1517  inputs.reference = makeid(8);
    … …  
    1921    : (inputs.mode = "LIVE");
    2022
    21   console.log(inputs)
    22   if (!inputs.theme) inputs.theme = 'primary';
     23  // console.log(inputs)
     24  // if (!inputs.theme) inputs.theme = 'primary';
    2325  event.preventDefault();
    2426  inputs.sdk = 'woocommerce';
    … …  
    3133    token:inputs.token,
    3234    mode: inputs.mode,
     35    currency: inputs.currency,
    3336    // callback:()=>{
    3437    //   // console.log("Paiment Effectuer")
    3538    // },
    3639    callback_url:inputs.callback,
    37     custom_id: inputs.reference
     40    custom_id: inputs.reference,
     41    case: inputs.form,
    3842  });
    3943  button.addEventListener('click', function (event) {

  • feexpay/trunk/includes/class-wc-feexpay-gateway.php

    r2918279 r2922988  
    4242        $this->feexpay_config['key'] = $this->token;
    4343        $this->feexpay_config['key'] = $this->shop;
     44        $this->feexpay_config['currency'] = get_woocommerce_currency();
     45
    4446        $this->feexpay = new Feexpay\FeexpayClass($this->token, $this->shop, $sandbox=true);
    4547
    … …  
    8890    public function import_admin_scripts()
    8991    {
    90         wp_enqueue_script('jscolor', plugins_url('../assets/js/jscolor.js', __FILE__), [], 'v1', true);
    91         wp_enqueue_script('setup-admin-script', plugins_url('../assets/js/admin.js', __FILE__), [], 'v1', true);
     92//        wp_enqueue_script('jscolor', plugins_url('../assets/js/jscolor.js', __FILE__), [], 'v1', true);
     93//        wp_enqueue_script('setup-admin-script', plugins_url('../assets/js/admin.js', __FILE__), [], 'v1', true);
    9294    }
    9395
    … …  
    193195
    194196            if (($response->status == Status\STATUS::SUCCESS || $response->status == Status\STATUS::SUCCESSFUL) && $response->amount >= $order->get_total()) {
    195 
    196197                $order->update_status('completed');
    197198                $order->add_order_note(__('Payment was successful on feexpay', 'feexpay'));
    … …  
    208209                $customer_note .= __('Your payment has not been confirmed yet, so we have to put your order <strong>on-hold</strong> ', 'feexpay');
    209210                $customer_note .= __('If this persists, Please, contact us for information regarding this order.', 'feexpay');
    210 
    211211                $order->add_order_note($customer_note, 1);
    212212                wc_add_notice($customer_note, 'notice');
    … …  
    221221                $admin_note = __('Attention: New order has been placed on hold because of incorrect payment amount or currency. Please, look into it. <br>', 'feexpay');
    222222                $admin_note .= __('Amount paid: ' . $order->get_currency() . ' ' . $response->amount . ' <br> Order amount: ' . $order->get_order_currency() . ' ' . $order->order_total . ' <br> Reference: ' . sanitize_text_field($_GET['ref']), 'feexpay');
    223 
    224223                $order->add_order_note($customer_note, 1);
    225224                $order->add_order_note($admin_note);
    226225                wc_add_notice($customer_note, 'notice');
    227 
    228226                $woocommerce->cart->empty_cart();
    229227                wp_redirect($this->get_return_url($order));
Note: See TracChangeset for help on using the changeset viewer.