Changeset 3285646

Timestamp:

05/01/2025 01:57:31 PM (11 months ago)

Author:

openstream

Message:

The option has been added to select whether the prices transferred to Run My Accounts include VAT or not.

Location:

run-my-accounts-for-woocommerce

Files:

• tags/1.9.0 (added)
• tags/1.9.0/LICENSE (added)
• tags/1.9.0/README.md (added)
• tags/1.9.0/assets (added)
• tags/1.9.0/assets/css (added)
• tags/1.9.0/assets/css/select2.min.css (added)
• tags/1.9.0/assets/js (added)
• tags/1.9.0/assets/js/admin.js (added)
• tags/1.9.0/assets/js/select2.min.js (added)
• tags/1.9.0/classes (added)
• tags/1.9.0/classes/class-RMA_WC_API.php (added)
• tags/1.9.0/classes/class-RMA_WC_Backend.php (added)
• tags/1.9.0/classes/class-RMA_WC_Backend_Abstract.php (added)
• tags/1.9.0/classes/class-RMA_WC_Collective_Invoicing.php (added)
• tags/1.9.0/classes/class-RMA_WC_Frontend.php (added)
• tags/1.9.0/classes/class-RMA_WC_Payment.php (added)
• tags/1.9.0/classes/class-RMA_WC_Rental_And_Booking.php (added)
• tags/1.9.0/classes/class-RMA_WC_Settings_Page.php (added)
• tags/1.9.0/index.php (added)
• tags/1.9.0/readme.txt (added)
• tags/1.9.0/rma-wc-main.php (added)
• tags/1.9.0/rma-wc.php (added)
• tags/1.9.0/templates (added)
• tags/1.9.0/templates/email (added)
• tags/1.9.0/templates/email/error-email-template.php (added)
• tags/1.9.0/uninstall.php (added)
• trunk/classes/class-RMA_WC_API.php (modified) (4 diffs)
• trunk/classes/class-RMA_WC_Settings_Page.php (modified) (4 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/rma-wc.php (modified) (1 diff)

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_API.php

@@ -490 +490 @@
             $order_payment_method = $order->get_payment_method();
 
-            // if order is done without user account
+            $option_billing       = get_option( 'wc_rma_settings' );
+
+            // transfer price net
+            if( isset( $option_billing[ 'rma-tax-transfer' ] ) && 'net' == $option_billing[ 'rma-tax-transfer' ] ) {
+                $tax_included = 'false';
+            }
+            // transfer price gross
+            elseif( isset( $option_billing[ 'rma-tax-transfer' ] ) && 'gross' == $option_billing[ 'rma-tax-transfer' ] ) {
+                $tax_included = 'true';
+            }
+            // get the settings from WooCommerce
+            else {
+                $tax_included = $order->get_prices_include_tax() ? 'true' : 'false';
+            }
+
+            // if the order is done without a user account
             if ( 0 == $order->get_meta( '_customer_user', true ) ) {
 
@@ -499 +514 @@
                     $rma_customer_id = (new RMA_WC_API)->create_rma_customer('order', $order_id );
 
-                    if ( false == $rma_customer_id ) {
+                    if ( ! $rma_customer_id) {
 
                         $log_values = array(
@@ -517 +532 @@
 
                     // customer id is equal to predefined catch all guest account
-                    $rma_customer_id         = $settings['rma-guest-catch-all'];
-
-                }
-
-            }
-            // ...or with user account
+                    $rma_customer_id = $settings[ 'rma-guest-catch-all' ];
+
+                }
+
+            }
+            // ...or with a user account
             else {
 
-                $rma_customer_id             = get_user_meta( $order->get_customer_id(), 'rma_customer', true );
+                $rma_customer_id = get_user_meta( $order->get_customer_id(), 'rma_customer', true );
 
             }
@@ -532 +547 @@
             $order_details[ 'currency' ]       = $order->get_currency();
             $order_details[ 'orderdate' ]      = wc_format_datetime( $order->get_date_created(),'d.m.Y' );
-            $order_details[ 'taxincluded' ]    = $order->get_prices_include_tax() ? 'true' : 'false';
+            $order_details[ 'taxincluded' ]    = $tax_included;
             $order_details[ 'customernumber' ] = $rma_customer_id;
             $order_details[ 'ar_accno' ]       = isset( $option_accounting[ $order_payment_method ] ) && !empty( $option_accounting[ $order_payment_method ] ) ? $option_accounting[ $order_payment_method ] : '';

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_Settings_Page.php

@@ -47 +47 @@
 
             add_action( 'admin_menu', array( $this, 'add_plugin_page' ) );
+
         }
 
@@ -374 +375 @@
             );
 
+            $id = 'rma-tax-transfer';
+            add_settings_field(
+                $id,
+                esc_html__( 'Price transfer with tax', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group'    => $this->option_group_general,
+                    'id'              => $id,
+                    'options'         => $this->options_general,
+                    'select_options'  => array(
+                        ''            => esc_html__( 'WooCommerce settings','run-my-accounts-for-woocommerce') ,
+                        'net'         => esc_html__( 'Item prices net (excl. VAT)','run-my-accounts-for-woocommerce' ),
+                        'gross'       => esc_html__( 'Item prices gross (incl. VAT)','run-my-accounts-for-woocommerce' ),
+                    ),
+                    'description'     => esc_html__( 'How should the item prices be transferred in relation to VAT? The WooCommerce settings are related to WooCommerce > Settings > Tax > Tax options.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
         }
 
@@ -408 +429 @@
                     'class'        => 'payment-trigger',
                     'description'  => esc_html__('When should the payment be booked in Run My Accounts', 'run-my-accounts-for-woocommerce' ),
-
                 )
             );
@@ -1108 +1128 @@
          */
         public function option_select_cb( $args ) {
-            $option_group   = (isset($args['option_group'])) ? $args['option_group'] : '';
-            $id             = (isset($args['id'])) ? $args['id'] : '';
-            $options        = (isset($args['options'])) ? $args['options'] : '';
-            $select_options = (isset($args['select_options'])) ? $args['select_options'] : array();
-            $description    = (isset($args['description'])) ? $args['description'] : '';
-            $class          = (isset($args['class'])) ? $args['class'] : '';
-
-            echo '<select name="' . $option_group . '[' . $id . ']"' . ( !empty( $class) ? 'id="'. $id .'" class="' . $class . '"' : '' ) . '>';
+            $option_group   = ( isset( $args[ 'option_group'] ) ) ? $args[ 'option_group' ] : '';
+            $id             = ( isset( $args[ 'id'] ) ) ? $args[ 'id' ] : '';
+            $options        = ( isset( $args[ 'options'] ) ) ? $args[ 'options' ] : '';
+            $select_options = ( isset( $args[ 'select_options'] ) ) ? $args[ 'select_options' ] : array();
+            $description    = ( isset( $args[ 'description'] ) ) ? $args[ 'description' ] : '';
+            $class          = ( isset( $args[ 'class'] ) ) ? $args[ 'class' ] : '';
+            $style          = ( isset( $args[ 'style'] ) ) ? $args[ 'style' ] : '';
+
+            echo '<select name="' . $option_group . '[' . $id . ']"' . ( !empty( $id) ? 'id="'. $id .'"' : '' ) . ( !empty( $class) ? ' class="' . $class . '"' : '' ) . ( !empty( $style) ? ' style="' . $style . '"' : '' ) . '>';
 
             foreach ( $select_options as $value => $text ) {

run-my-accounts-for-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 * Requires at least: 6.2
 * Tested up to: 6.8
-* Stable tag: 1.8.1
+* Stable tag: 1.9.0
 * Requires PHP: 7.2
 * License: GPLv2
@@ -45 +45 @@
 == Screenshots ==
 1. General settings.
-2. Settings for dedicated receivable account for each payment gateway.
-3. Settings on user page.
+2. Settings for a dedicated receivable account for each payment gateway.
+3. Settings on the user page.
 
 == Known issues ==
-* Discount codes does not be reflected on the invoice.
+* Discount codes do not be reflected on the invoice.
 * Credits are not created in Run My Accounts.
 * The collective invoice only works with available products. If a product was deleted between the order and the invoice, the product cannot be included in the invoice anymore.
 
 == Changelog ==
+= 1.9.0 =
+* Added the option to select separately whether the prices transferred to Run My Accounts include VAT or not.
+
 = 1.8.1 =
 * Added compatibility with price rules plugins

run-my-accounts-for-woocommerce/trunk/rma-wc.php

@@ -11 +11 @@
  *
  * Plugin Name:          Run my Accounts for WooCommerce
- * Version:              1.8.1
+ * Version:              1.9.0
  * Description:          This plug-in connects WooCommerce to <a href="https://www.runmyaccounts.ch/">Run my Accounts</a>. Create customers and invoices as soon as you get an order in your WooCommerce shop.
  * Requires at least:    6.2