WordPress.org
Get WordPress

Plugin Directory

Changeset 2514705


Ignore:
Timestamp:
04/14/2021 09:44:54 AM (5 years ago)
Author:
iplus
Message:

v 3.0.7

Location:
smallpay/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • smallpay/trunk/assets/js/smallpay.js

    r2476384 r2514705  
    2020
    2121function installmentsCalc() {
     22  var admin_url = document.getElementById("smallpay_admin_url").value;
    2223  jQuery("#smallpay-installments-number").select2({
    2324    placeholder: 'Select an option'
    … …  
    3031      installments: jQuery("#smallpay-installments-number").val()
    3132    },
    32     url: "/wp-admin/admin-ajax.php",
     33    url: admin_url + "admin-ajax.php",
    3334    success: function(response) {
    3435        if (jQuery("#smallpay-installments-number").val() != 1) {
    … …  
    280281
    281282function exp_check() {
     283  var admin_url = document.getElementById("smallpay_admin_url").value;
    282284  var installments = document.getElementById('smallpay-installments-number').value;
    283285  var exp = document.getElementById('dettaglioCarta[scadenza]').value;
    … …  
    291293      exp: exp
    292294    },
    293     url: "/wp-admin/admin-ajax.php",
     295    url: admin_url + "admin-ajax.php",
    294296    success: function(response) {
    295297      retAjax = response;

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

    r2476384 r2514705  
    367367                    if ($maxInstallments > 1) {
    368368                        echo '<div class="smallpay-custom-field-wrapper" >'
    369                             . '<span class="smallpay-custom-badge" style="text-transform: uppercase;padding: 3px;width: 70%;max-width: 400px;margin-bottom: 1em;border: 1px solid;border-radius: 3px;/*color: black;border-color: black;*/display: inline-block;margin-top: 1em;"">'
     369                            . '<span class="smallpay-custom-badge" style="text-transform: uppercase;padding: 3px;width: 100%;max-width: 400px;margin-bottom: 1em;border: 1px solid;border-radius: 3px;/*color: black;border-color: black;*/display: inline-block;margin-top: 1em;"">'
    370370                            . __('product available in', 'smallpay')
    371371                            . ' ' . $maxInstallments . ' ' . __('installments', 'smallpay') . '</span>'
    … …  
    465465        $enviroment = $this->oConfig->enviroment;
    466466        $APIKEY = $this->oConfig->nexi_alias;
    467         $amount = floatval(preg_replace('#[^\d]#', '', strip_tags($woocommerce->cart->get_total())));
    468 /*        $amount = 1;*/
     467        $amount = preg_replace('#[^\d,]#', '', strip_tags($woocommerce->cart->get_total()));
     468        $amount = number_format($amount,2,',', '');
     469        $amount = $amount * 100;
     470
    469471        $transactionId = $oXPay->get_cod_trans(date('Ymd'));
    470472        $divisa = $oXPay->get_divisa_code();
    … …  
    516518        $oXPay = new WC_SmallPay_XPay($this->oConfig->url_gateway);
    517519        $installments = sanitize_text_field($_REQUEST['installments']);
    518         $amount = number_format(($order->get_total() * 100), 0, "", "");
     520        $amount = preg_replace('#[^\d,]#', '', strip_tags($order->get_total()));
     521        $amount = number_format($amount,2,',', '');
     522        $amount = $amount * 100;
    519523        $instData = $this->calc_installments($installments, true);
    520524        $checkExp = $this->exp_check($installments, sanitize_text_field($_REQUEST['dettaglioCarta']['scadenza']), true);
    … …  
    574578    public function calc_installments($installments = null, $php = false)
    575579    {
     580        error_log('***');
    576581        $ret = array();
    577582        if ($installments == null && !empty($_REQUEST['installments'])) {
    … …  
    580585        global $woocommerce;
    581586        $totalNF = $woocommerce->cart->total;
     587        $totalNF = number_format($totalNF, 2,'.','');
     588        error_log('$totalNF :: ' . $totalNF);
    582589        $shippingNF = $woocommerce->cart->shipping_total;
     590        $shippingNF = number_format($shippingNF, 2,'.','');
     591        error_log('$shippingNF :: ' . $shippingNF);
    583592        if (isset($installments) && $installments != 0) {
    584593            $installment_amountNF = floor((($totalNF*100)-($shippingNF*100)) / $installments);
    … …  
    588597            $first_installment_amountNF = 0;
    589598        }
     599        error_log('$installment_amountNF :: ' . $installment_amountNF);
     600        error_log('$first_installment_amountNF :: ' . $first_installment_amountNF);
    590601        $installment_amount = $installment_amountNF / 100;
    591602        //$installment_amount = number_format($installment_amount, 2, ',', ' ');
    … …  
    593604        //$first_installment_amount = number_format($first_installment_amount, 2, ',', ' ');
    594605        //$total = number_format($totalNF, 2, ',', ' ');
     606        error_log('$installment_amount :: ' . $installment_amount);
     607        error_log('$first_installment_amount :: ' . $first_installment_amount);
     608        error_log('---');
    595609        $oXPay = new WC_SmallPay_XPay();
    596610        $transactionId = $oXPay->get_cod_trans(date('Ymd'));
    … …  
    608622              <td class="product-name smallpay-installment" >1</td>
    609623              <td class="product-name smallpay-date" >' . __('Today', 'smallpay') . '</td>
    610               <td class="product-total smallpay-amount" >'.wc_price($first_installment_amount).'</td>
     624              <td class="product-total smallpay-amount" >€ '. number_format($first_installment_amount, 2, ',', '') .'</td>
    611625            </tr>';
    612626        $date = new DateTime(date("Y-m-05"));
    … …  
    616630              <td class="product-name smallpay-installment" >' . $inst . '</td>
    617631              <td class="product-name smallpay-date" >' . $date->format('05/m/Y') . '</td>
    618               <td class="product-total smallpay-amount" >' . wc_price($installment_amount). '</td>
     632              <td class="product-total smallpay-amount" >€ ' . number_format($installment_amount, 2, ',', ''). '</td>
    619633            </tr>';
    620634        }
    621635        $res .= '  <tr class="cart_item">
    622636          <td class="product-name smallpay-total" colspan="2">' . __('Total', 'smallpay') . '</td>
    623           <td class="product-total smallpay-amount" >' . wc_price($totalNF). '</td>
     637          <td class="product-total smallpay-amount" >€ ' . number_format($totalNF, 2, ',', ''). '</td>
    624638        </tr>';
    625639        $res .= '</table>';

  • smallpay/trunk/readme.txt

    r2476384 r2514705  
    55Author: SmallPay
    66Requires at least: 4.4.0
    7 Tested up to: 5.6.1
     7Tested up to: 5.7.0
    88WC Requires at least: 3.0.0
    9 WC Tested up to: 5.0.0
    10 Stable tag: 3.0.5
     9WC Tested up to: 5.2.0
     10Stable tag: 3.0.7
    1111License: GNU General Public License v3.0
    1212License URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    102102 * Fixed - Issue with Wordpress back office visualization
    103103 
    104 = 3.0.5 =
     104= 3.0.6 =
    105105 * Fixed - possibility to proceed to purchase even with unconfirmed installments.
     106 
     107= 3.0.7 =
     108 * Fixed - issue with wordpress installed in subfolders

  • smallpay/trunk/smallpay.php

    r2476384 r2514705  
    55 * Plugin URI:
    66 * Description: Official SmallPay plugin.
    7  * Version: 3.0.5
     7 * Version: 3.0.7
    88 * Author: SmallPay Srl
    99 * Author URI: https://www.smallpay.it
    … …  
    2323}
    2424
    25 define('SPWC_PLUGIN_VERSION', '3.0.5');
     25define('SPWC_PLUGIN_VERSION', '3.0.7');
    2626
    2727class WC_SmallPay

  • smallpay/trunk/templates/form.php

    r2476384 r2514705  
    107107 . '     <input type="hidden" id="smallpay_xpay_APIKEY" value="' . $APIKEY . '">
    108108        <input type="hidden" id="smallpay_xpay_amount" value="' . $amount . '">
     109        <input type="hidden" id="smallpay_admin_url" value="' . admin_url() . '">
    109110        <input type="hidden" id="smallpay_xpay_transactionId" value="' . $transactionId . '">
    110111        <input type="hidden" id="smallpay_xpay_divisa" value="' . $divisa . '">
Note: See TracChangeset for help on using the changeset viewer.