Changeset 2895596
- Timestamp:
- 04/07/2023 12:50:27 PM (3 years ago)
- Location:
- simple-payment
- Files:
-
- 10 edited
- 1 copied
-
tags/2.3.2 (copied) (copied from simple-payment/trunk)
-
tags/2.3.2/addons/woocommerce/js/simple-payment-woocommerce-checkout.js (modified) (3 diffs)
-
tags/2.3.2/languages/simple-payment.pot (modified) (2 diffs)
-
tags/2.3.2/readme.txt (modified) (1 diff)
-
tags/2.3.2/simple-payment-plugin.php (modified) (2 diffs)
-
tags/2.3.2/vendor/yalla-ya/simple-payment/Engines/Cardcom.php (modified) (2 diffs)
-
trunk/addons/woocommerce/js/simple-payment-woocommerce-checkout.js (modified) (3 diffs)
-
trunk/languages/simple-payment.pot (modified) (2 diffs)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/simple-payment-plugin.php (modified) (2 diffs)
-
trunk/vendor/yalla-ya/simple-payment/Engines/Cardcom.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
simple-payment/tags/2.3.2/addons/woocommerce/js/simple-payment-woocommerce-checkout.js
r2589463 r2895596 17 17 }, 18 18 19 scroll_to: function( o) {20 $.scroll_to_notices( $('[sp-data="container"]'));19 scroll_to: function( o ) { 20 $.scroll_to_notices( $ ('[sp-data="container"]' ) ); 21 21 }, 22 22 … … 27 27 28 28 place_order: function() { 29 console.log( 'SimplePayment place_order' ); 29 30 SimplePaymentWooCommerce.form_unblock(); 30 if ( !SimplePayment.params['woocommerce_show_checkout']) return;31 if ( !(SimplePayment.params['display'] == 'iframe' ||32 SimplePayment.params[ 'display'] == 'modal')) return;31 if ( !SimplePayment.params[ 'woocommerce_show_checkout' ] ) return; 32 if ( !( SimplePayment.params[ 'display' ] == 'iframe' || 33 SimplePayment.params[ 'display' ] == 'modal' ) ) return; 33 34 34 $( document).ajaxSuccess(SimplePaymentWooCommerce.place_order_success);35 $( document ).ajaxSuccess( SimplePaymentWooCommerce.place_order_success ); 35 36 if ( 'place_order' != this.hook_level ) return; 36 37 // TODO: if wish to hook on place_order, process all information here. 37 return( false);38 return( false ); 38 39 }, 39 40 place_order_success: function(event, xhr, options, result) { 41 if ( !SimplePayment.params[ 'woocommerce_show_checkout' ] ) return; 42 if ( !( SimplePayment.params[ 'display' ] == 'iframe' || 43 SimplePayment.params['display'] == 'modal' ) ) return; 44 if ( 'checkout_place_order_success' == event.type) return(true); // false for checkout error, true to process redirect 45 if ( !options || !result || options['url'] != wc_checkout_params.checkout_url) return; 46 if ('failure' === result.result) return(true); 40 41 place_order_success: function( event, xhr, options, result ) { 42 //if ( 'place_order_success' !== this.hook_level ) return; 43 if ( 'checkout_place_order_success' !== event.type 44 || !SimplePayment.params[ 'woocommerce_show_checkout' ] 45 || !( SimplePayment.params[ 'display' ] == 'iframe' || 46 SimplePayment.params[ 'display' ] == 'modal' ) ) return; 47 //if ( 'checkout_place_order_success' == event.type ) return( true ); // false for checkout error, true to process redirect 48 console.log( 'SimplePayment place_order_success - processing' ); 49 if ( typeof( result ) == 'undefined' ) { // Adapttion for the WC 7.0 while using AbortContoller and not global ajax 50 result = xhr; 51 } else { 52 if ( !options || !result || options[ 'url' ] != wc_checkout_params.checkout_url ) return; 53 } 54 if ( 'failure' === result.result ) return( true ); // probably should be false 47 55 // We are using error on original checkout process, we might consider using success 48 56 $( document.body ).on( 'checkout_error', this.scroll_to ); … … 54 62 55 63 }; 56 $( document).on('simple_payment_init', function() {57 return( false); // Do not continue with the rest of simple payment init58 } );64 $( document ).on('simple_payment_init', function() { 65 return( false ); // Do not continue with the rest of simple payment init 66 } ); 59 67 this.SimplePaymentWooCommerce = SimplePaymentWooCommerce.init(); 60 })(jQuery);68 })( jQuery ); -
simple-payment/tags/2.3.2/languages/simple-payment.pot
r2881380 r2895596 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: Simple Payment 2. 2.9\n"5 "Project-Id-Version: Simple Payment 2.3.1\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/simple-payment\n" 7 7 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 10 10 "Content-Type: text/plain; charset=UTF-8\n" 11 11 "Content-Transfer-Encoding: 8bit\n" 12 "POT-Creation-Date: 2023-0 3-16T16:19:23+00:00\n"12 "POT-Creation-Date: 2023-04-07T12:49:35+00:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 14 "X-Generator: WP-CLI 2.6.0\n" -
simple-payment/tags/2.3.2/readme.txt
r2881380 r2895596 4 4 Tags: credit card, simple payment, donation, membership, checkout, payment request, payment gateway, sales, woocommerce, store, ecommerce, e-commerce, commerce, gutenberg, elementor, cardcom, icount, icredit, payme, isracard, paypal 5 5 Requires at least: 4.6 6 Tested up to: 6. 1.17 Stable tag: 2.3. 06 Tested up to: 6.2.0 7 Stable tag: 2.3.2 8 8 Requires PHP: 5.4 9 9 License: GPLv2 or later -
simple-payment/tags/2.3.2/simple-payment-plugin.php
r2881380 r2895596 4 4 * Plugin URI: https://simple-payment.yalla-ya.com 5 5 * Description: Simple Payment enables integration with multiple payment gateways, and customize multiple payment forms. 6 * Version: 2.3. 06 * Version: 2.3.2 7 7 * Author: Ido Kobelkowsky / yalla ya! 8 8 * Author URI: https://github.com/idokd … … 10 10 * Text Domain: simple-payment 11 11 * Domain Path: /languages 12 * WC tested up to: 7.5 12 * WC tested up to: 7.5.1 13 13 * WC requires at least: 2.6 14 14 */ -
simple-payment/tags/2.3.2/vendor/yalla-ya/simple-payment/Engines/Cardcom.php
r2881379 r2895596 178 178 // TODO: fetch VISA, YEAR, MONTH, ID??? 179 179 $token = null; 180 if ( $status['Token']) {180 if ( isset( $status[ 'Token' ] ) && $status[ 'Token' ] ) { 181 181 $token = [ 182 182 'token' => $status['Token'], … … 189 189 } 190 190 $response = $status; 191 $this->confirmation_code = $response['InternalDealNumber'];191 $this->confirmation_code = isset( $response[ 'InternalDealNumber' ] ) ? $response[ 'InternalDealNumber' ] : null; 192 192 $this->save([ 193 193 'transaction_id' => $this->transaction, -
simple-payment/trunk/addons/woocommerce/js/simple-payment-woocommerce-checkout.js
r2589463 r2895596 17 17 }, 18 18 19 scroll_to: function( o) {20 $.scroll_to_notices( $('[sp-data="container"]'));19 scroll_to: function( o ) { 20 $.scroll_to_notices( $ ('[sp-data="container"]' ) ); 21 21 }, 22 22 … … 27 27 28 28 place_order: function() { 29 console.log( 'SimplePayment place_order' ); 29 30 SimplePaymentWooCommerce.form_unblock(); 30 if ( !SimplePayment.params['woocommerce_show_checkout']) return;31 if ( !(SimplePayment.params['display'] == 'iframe' ||32 SimplePayment.params[ 'display'] == 'modal')) return;31 if ( !SimplePayment.params[ 'woocommerce_show_checkout' ] ) return; 32 if ( !( SimplePayment.params[ 'display' ] == 'iframe' || 33 SimplePayment.params[ 'display' ] == 'modal' ) ) return; 33 34 34 $( document).ajaxSuccess(SimplePaymentWooCommerce.place_order_success);35 $( document ).ajaxSuccess( SimplePaymentWooCommerce.place_order_success ); 35 36 if ( 'place_order' != this.hook_level ) return; 36 37 // TODO: if wish to hook on place_order, process all information here. 37 return( false);38 return( false ); 38 39 }, 39 40 place_order_success: function(event, xhr, options, result) { 41 if ( !SimplePayment.params[ 'woocommerce_show_checkout' ] ) return; 42 if ( !( SimplePayment.params[ 'display' ] == 'iframe' || 43 SimplePayment.params['display'] == 'modal' ) ) return; 44 if ( 'checkout_place_order_success' == event.type) return(true); // false for checkout error, true to process redirect 45 if ( !options || !result || options['url'] != wc_checkout_params.checkout_url) return; 46 if ('failure' === result.result) return(true); 40 41 place_order_success: function( event, xhr, options, result ) { 42 //if ( 'place_order_success' !== this.hook_level ) return; 43 if ( 'checkout_place_order_success' !== event.type 44 || !SimplePayment.params[ 'woocommerce_show_checkout' ] 45 || !( SimplePayment.params[ 'display' ] == 'iframe' || 46 SimplePayment.params[ 'display' ] == 'modal' ) ) return; 47 //if ( 'checkout_place_order_success' == event.type ) return( true ); // false for checkout error, true to process redirect 48 console.log( 'SimplePayment place_order_success - processing' ); 49 if ( typeof( result ) == 'undefined' ) { // Adapttion for the WC 7.0 while using AbortContoller and not global ajax 50 result = xhr; 51 } else { 52 if ( !options || !result || options[ 'url' ] != wc_checkout_params.checkout_url ) return; 53 } 54 if ( 'failure' === result.result ) return( true ); // probably should be false 47 55 // We are using error on original checkout process, we might consider using success 48 56 $( document.body ).on( 'checkout_error', this.scroll_to ); … … 54 62 55 63 }; 56 $( document).on('simple_payment_init', function() {57 return( false); // Do not continue with the rest of simple payment init58 } );64 $( document ).on('simple_payment_init', function() { 65 return( false ); // Do not continue with the rest of simple payment init 66 } ); 59 67 this.SimplePaymentWooCommerce = SimplePaymentWooCommerce.init(); 60 })(jQuery);68 })( jQuery ); -
simple-payment/trunk/languages/simple-payment.pot
r2881380 r2895596 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: Simple Payment 2. 2.9\n"5 "Project-Id-Version: Simple Payment 2.3.1\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/simple-payment\n" 7 7 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 10 10 "Content-Type: text/plain; charset=UTF-8\n" 11 11 "Content-Transfer-Encoding: 8bit\n" 12 "POT-Creation-Date: 2023-0 3-16T16:19:23+00:00\n"12 "POT-Creation-Date: 2023-04-07T12:49:35+00:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 14 "X-Generator: WP-CLI 2.6.0\n" -
simple-payment/trunk/readme.txt
r2881380 r2895596 4 4 Tags: credit card, simple payment, donation, membership, checkout, payment request, payment gateway, sales, woocommerce, store, ecommerce, e-commerce, commerce, gutenberg, elementor, cardcom, icount, icredit, payme, isracard, paypal 5 5 Requires at least: 4.6 6 Tested up to: 6. 1.17 Stable tag: 2.3. 06 Tested up to: 6.2.0 7 Stable tag: 2.3.2 8 8 Requires PHP: 5.4 9 9 License: GPLv2 or later -
simple-payment/trunk/simple-payment-plugin.php
r2881380 r2895596 4 4 * Plugin URI: https://simple-payment.yalla-ya.com 5 5 * Description: Simple Payment enables integration with multiple payment gateways, and customize multiple payment forms. 6 * Version: 2.3. 06 * Version: 2.3.2 7 7 * Author: Ido Kobelkowsky / yalla ya! 8 8 * Author URI: https://github.com/idokd … … 10 10 * Text Domain: simple-payment 11 11 * Domain Path: /languages 12 * WC tested up to: 7.5 12 * WC tested up to: 7.5.1 13 13 * WC requires at least: 2.6 14 14 */ -
simple-payment/trunk/vendor/yalla-ya/simple-payment/Engines/Cardcom.php
r2881379 r2895596 178 178 // TODO: fetch VISA, YEAR, MONTH, ID??? 179 179 $token = null; 180 if ( $status['Token']) {180 if ( isset( $status[ 'Token' ] ) && $status[ 'Token' ] ) { 181 181 $token = [ 182 182 'token' => $status['Token'], … … 189 189 } 190 190 $response = $status; 191 $this->confirmation_code = $response['InternalDealNumber'];191 $this->confirmation_code = isset( $response[ 'InternalDealNumber' ] ) ? $response[ 'InternalDealNumber' ] : null; 192 192 $this->save([ 193 193 'transaction_id' => $this->transaction,
Note: See TracChangeset
for help on using the changeset viewer.