Merge pull request #65 from Eoxia/2.3.2

2.3.2
Eoxia · Nov 23, 2020 · 6a48626 · 6a48626
2 parents c4efd53 + 70f77f9
commit 6a48626
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 21 deletions.
diff --git a/core/asset/js/backend.min.js b/core/asset/js/backend.min.js
diff --git a/modules/dolibarr/doli-products/class/class-doli-products.php b/modules/dolibarr/doli-products/class/class-doli-products.php
@@ -56,6 +56,7 @@ public function doli_to_wp( $doli_product, $wp_product, $save = true, &$notices
 			$wp_product->data['price_ttc']         = $doli_product->price_ttc;
 			$wp_product->data['tva_amount']        = $doli_product->price_ttc - $doli_product->price;
 			$wp_product->data['tva_tx']            = $doli_product->tva_tx;
+			$wp_product->data['stock']             = (int) $doli_product->stock_reel;
 			$wp_product->data['barcode']           = $doli_product->barcode;
 			$wp_product->data['fk_product_type']   = (int) $doli_product->type; // Product 0 or Service 1.
 			$wp_product->data['status']            = $doli_product->array_options->options__wps_status;
@@ -72,6 +73,7 @@ public function doli_to_wp( $doli_product, $wp_product, $save = true, &$notices
 				$data_sha['price']       = $doli_product->price;
 				$data_sha['price_ttc']   = $doli_product->price_ttc;
 				$data_sha['tva_tx']      = $doli_product->tva_tx;
+				$data_sha['stock']       = $doli_product->stock_reel;
 				$data_sha['status']      = $wp_product->data['status'];
 
 				$wp_product->data['sync_sha_256'] = hash( 'sha256', implode( ',', $data_sha ) );

diff --git a/modules/dolibarr/doli-sync/class/class-doli-sync.php b/modules/dolibarr/doli-sync/class/class-doli-sync.php
@@ -280,10 +280,10 @@ public function check_status( $id, $type ) {
 		if ( Settings::g()->debug_mode() ) {
 			//Start
 			echo '<pre>';
-			print_r(266 );
+			print_r('L266' );
 			print_r($response);
-			print_r('check dolibarr');
-			print_r(4);
+			print_r('check dolibarr sync');
+			print_r('4');
 			echo '</pre>';
 			//exit;
 			//End

diff --git a/modules/dolibarr/doli-sync/filter/class-doli-sync-filter.php b/modules/dolibarr/doli-sync/filter/class-doli-sync-filter.php
@@ -96,6 +96,7 @@ public function build_sha_product( $response, $wp_id ) {
 		$data_sha['price']       = $response->price;
 		$data_sha['price_ttc']   = $response->price_ttc;
 		$data_sha['tva_tx']      = $response->tva_tx;
+		$data_sha['stock']       = $response->stock_reel;
 		$data_sha['status']      = $response->array_options->options__wps_status;
 
 		if ( $response->array_options->options__wps_status == 1  || $response->array_options->options__wps_status == 'publish' ) {

diff --git a/modules/products/asset/js/product.backend.js b/modules/products/asset/js/product.backend.js
@@ -23,7 +23,7 @@ window.eoxiaJS.wpshop.product.init = function() {
  * @version 2.0.0
  */
 window.eoxiaJS.wpshop.product.event = function() {
-	jQuery( document ).on( 'wps-change-toggle', '.stock-field .toggle', window.eoxiaJS.wpshop.product.displayBlockStock );
+	jQuery( document ).on( 'click', '.stock-field .toggle', window.eoxiaJS.wpshop.product.displayBlockStock );
 	jQuery( document ).on( 'click', '.wps-list-product .table-header input[type="checkbox"]', window.eoxiaJS.wpshop.product.checkAll );
 	jQuery( document ).on( 'click', '.button-apply', window.eoxiaJS.wpshop.product.apply );
 	jQuery( document ).ready( window.eoxiaJS.wpshop.product.autoSynchro );
@@ -69,12 +69,19 @@ window.eoxiaJS.wpshop.product.event = function() {
  * @param {ClickEvent}  event [displayBlockStock].
  * @param {toggleState} L'état du toggle.
  */
-window.eoxiaJS.wpshop.product.displayBlockStock = function( event, toggleState ) {
-	if ( toggleState ) {
-		jQuery( '.stock-block' ).fadeIn();
-	} else {
+window.eoxiaJS.wpshop.product.displayBlockStock = function() {
+	var toggleON = jQuery( this ).hasClass( 'fa-toggle-on' );
+	var nextStep = '';
+	if ( toggleON ) {
+		nextStep = 'false';
+		jQuery( this ).removeClass( "fa-toggle-on" ).addClass( "fa-toggle-off" );
 		jQuery( '.stock-block' ).fadeOut();
+	} else {
+		nextStep = 'true';
+		jQuery( this ).removeClass( "fa-toggle-off" ).addClass( "fa-toggle-on" );
+		jQuery( '.stock-block' ).fadeIn();
 	}
+	jQuery( this ).closest( '.wpeo-form' ).find( '.manage_stock' ).attr( 'value' , nextStep );
 };
 
 /**

diff --git a/modules/products/view/metabox/configuration.view.php b/modules/products/view/metabox/configuration.view.php
@@ -40,7 +40,7 @@
 		<div class="form-element stock-block" style="<?php echo $product->data['manage_stock'] ? '' : 'display: none;'; ?>">
 			<span class="form-label"><?php esc_html_e( 'Stock', 'wpshop' ); ?></span>
 			<label class="form-field-container">
-				<input type="text" class="form-field" name="product_data[stock]" value="<?php echo esc_attr( $product->data['stock'] ); ?>" />
+				<input type="text" class="form-field" name="product_data[stock]" value="<?php echo esc_attr( $product->data['stock'] ); ?>" readonly/>
 			</label>
 		</div>
 

diff --git a/modules/settings/asset/js/settings.backend.js b/modules/settings/asset/js/settings.backend.js
@@ -31,7 +31,6 @@ window.eoxiaJS.wpshop.settings.event = function() {
  * @return {void}
  */
 window.eoxiaJS.wpshop.settings.buttonToggle = function( event ) {
-	console.log( 'test');
 	var toggleON = jQuery( this ).hasClass( 'fa-toggle-on' );
 	var nextStep = '';
 	if (toggleON) {

diff --git a/modules/stripe/class/class-stripe.php b/modules/stripe/class/class-stripe.php
@@ -12,7 +12,6 @@
 namespace wpshop;
 
 use eoxia\Singleton_Util;
-use Stripe\Checkout\Session;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -51,7 +50,7 @@ public function process_payment( $order ) {
 			'currency' => 'eur',
 		);
 
-		$session = Session::create( array(
+		$session = Stripe\Checkout\Session::create( array(
 			'success_url'          => Pages::g()->get_checkout_link() . '/received/order/' . $order->data['external_id'],
 			'cancel_url'           => site_url(),
 			'payment_method_types' => array( 'card' ),

diff --git a/package-lock.json b/package-lock.json
diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Donate link: https://www.wpshop.fr/
 Requires at least: 4.4
 Tested up to: 5.5.3
 Requires PHP: 7.0
-Stable tag: 2.3.1
+Stable tag: 2.3.2
 License: GPLv3 or later
 License URI: https://spdx.org/licenses/GPL-3.0-or-later.html
 
@@ -29,7 +29,7 @@ WPshop vous propose également des [thèmes wordpress eCommerce](https://shop.eo
 
 == Installation ==
 
-Consultez notre [documentation en ligne](http://www.wpshop.fr/documentations/presentation-wpshop "documentation wpshop").
+Consultez notre [documentation en ligne](http://www.wpshop.fr/documentation/ "documentation wpshop").
 L'installation du plugin peut se faire de 2 façons :
 
 * Méthode 1
@@ -65,6 +65,13 @@ Il n'est pas possible de migrer les données vers la version WPShop 2.X.X.
 
 == Changelog ==
 
+= Version 2.3.2 =
+
+* Add - Add stock to product synchronisation.
+
+* Fix - Stripe API request error.
+* Fix - Media.
+
 = Version 2.3.1 =
 
 * Add - Mode debug.

diff --git a/wpshop.config.json b/wpshop.config.json
@@ -2,7 +2,7 @@
 	"name": "WPshop",
 	"slug": "wpshop",
     "since": "2.0.0",
-	"version": "2.3.1",
+	"version": "2.3.2",
     "description": "L'application WPshop 2",
     "externals": [],
 	"modules": [

diff --git a/wpshop.php b/wpshop.php
@@ -3,7 +3,7 @@
  * Plugin Name: WPshop 2
  * Plugin URI:  https://wpshop.fr/
  * Description: Simple, fast, efficient it will transform your WordPress into an internet sales site
- * Version:     2.3.1
+ * Version:     2.3.2
  * Author:      Eoxia <[email protected]>
  * Author URI:  http://www.eoxia.com/
  * License:     GPLv3
@@ -30,7 +30,7 @@
 }
 
 // Include composer component.
-// require_once 'vendor/autoload.php';
+require_once 'vendor/autoload.php';
 
 // Boot your plugin.
 Init_Util::g()->exec( PLUGIN_WPSHOP_PATH, basename( __FILE__, '.php' ) );