WordPress.org
Get WordPress

Plugin Directory

Changeset 2700692


Ignore:
Timestamp:
03/28/2022 02:27:03 PM (4 years ago)
Author:
delyva
Message:

v1.1.28

Location:
delyvax/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • delyvax/trunk/delyvax.php

    r2691138 r2700692  
    44    Plugin URI: https://delyva.com
    55    description: The official Delyva plugin helps store owners to integrate WooCommerce with [Delyva](https://delyva.com) for seamless service comparison and order processing.
    6     Version: 1.1.27
     6    Version: 1.1.28
    77    Author: Delyva
    88    Author URI: https://delyva.com
    … …  
    1313    defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
    1414    define('DELYVAX_API_ENDPOINT', 'https://api.delyva.app/');
    15     define('DELYVAX_PLUGIN_VERSION', '1.1.27');
     15    define('DELYVAX_PLUGIN_VERSION', '1.1.28');
    1616
    1717    require_once plugin_dir_path(__FILE__) . 'functions.php';

  • delyvax/trunk/functions.php

    r2691138 r2700692  
    106106    {
    107107        delyvax_create_order($order, $user, true);
     108    }else if ($settings['create_shipment_on_paid'] == 'nothing')
     109    {
     110        //do nothing
    108111    }else {
    109112        delyvax_create_order($order, $user, false);
    … …  
    123126
    124127        delyvax_create_order($order, $user, true);
     128    }else if ($settings['create_shipment_on_paid'] == 'nothing')
     129    {
     130        //do nothing
    125131    }else {
    126132        delyvax_create_order($order, $user, false);
    … …  
    144150            delyvax_create_order($order, $user, true);
    145151        }
     152    }else if ($settings['create_shipment_on_confirm'] == 'nothing')
     153    {
     154        //do nothing
    146155    }else {
    147156        if($order->get_status() == 'preparing') //$order->get_status() == 'cancelled'
    … …  
    361370      $processing_hours = $settings['processing_hours'];
    362371      $item_type = ($settings['item_type']) ? $settings['item_type'] : "PARCEL" ;
     372
     373      $include_order_note = $settings['include_order_note'];
    363374
    364375      $multivendor_option = $settings['multivendor'];
    … …  
    474485          $main_order = $order;
    475486
    476           $order_notes = 'Order No: #'.$main_order->get_id().':';
     487          if($include_order_note != 'empty') $order_notes = 'Order No: #'.$main_order->get_id().':';
     488
    477489
    478490              foreach ( $sub_order->get_items() as $item )
    … …  
    485497              $sub_order = wc_get_order($sub->ID);
    486498
    487               $order_notes = 'Order No: #'.$sub_order->get_id().': ';
     499              if($include_order_note != 'empty') $order_notes = 'Order No: #'.$sub_order->get_id().': ';
    488500
    489501              $product_store_name = get_bloginfo( 'name' );
    … …  
    613625                  $total_price = $total_price + $total;
    614626
    615                   $order_notes = $order_notes.'#'.($count+1).'. ['.$store_name.'] '.$product_name.' X '.$quantity.'pcs. ';
     627                  if($include_order_note == 'ordernproduct') $order_notes = $order_notes.'#'.($count+1).'. ['.$store_name.'] '.$product_name.' X '.$quantity.'pcs. ';
    616628
    617629                  $count++;
    … …  
    621633          $main_order = $order;
    622634
    623           $order_notes = 'Order No: #'.$main_order->get_id().': ';
     635          if($include_order_note != 'empty') $order_notes = 'Order No: #'.$main_order->get_id().': ';
    624636
    625637          $product_store_name = get_bloginfo( 'name' );
    … …  
    756768              $total_price = $total_price + $total;
    757769
    758               $order_notes = $order_notes.'#'.($count+1).'. ['.$store_name.'] '.$product_name.' X '.$quantity.'pcs. ';
     770              if($include_order_note == 'ordernproduct') $order_notes = $order_notes.'#'.($count+1).'. ['.$store_name.'] '.$product_name.' X '.$quantity.'pcs. ';
    759771
    760772              $count++;

  • delyvax/trunk/includes/delyvax-shipping.php

    r2691138 r2700692  
    6969                'options' => array(
    7070                  '' => __( 'Save as draft', 'woocommerce' ),
    71                   'yes' => __( 'Process immediately', 'woocommerce' )
     71                  'yes' => __( 'Process immediately', 'woocommerce' ),
     72                  'nothing' => __( 'Do nothing', 'woocommerce' )
    7273                )
    7374            ),
    … …  
    8081                'options' => array(
    8182                  '' => __( 'Save as draft', 'woocommerce' ),
    82                   'yes' => __( 'Process immediately', 'woocommerce' )
     83                  'yes' => __( 'Process immediately', 'woocommerce' ),
     84                  'nothing' => __( 'Do nothing', 'woocommerce' )
    8385                )
    8486            ),
    … …  
    279281                'description' => __( 'Leave empty or type `woocommerce` or your web design agency code.' ),
    280282            ),
     283            'include_order_note' => array(
     284                'title'     => __( 'Order note', 'delyvax' ),
     285                'default' => __('orderno', 'delyvax'),
     286                'id' => 'delyvax_include_order_note',
     287                'type'    => 'select',
     288                'options' => array(
     289                  'orderno' => __( 'Include order no.', 'woocommerce' ),
     290                  'ordernproduct' => __( 'Include order no. + product info', 'woocommerce' ),
     291                  'empty' => __( 'Empty', 'woocommerce' )
     292                )
     293            ),
    281294            array(
    282295                'title' => __( 'Shipping Rate Adjustments', 'delyvax' ),

  • delyvax/trunk/readme.txt

    r2691138 r2700692  
    44Requires at least: 5.4
    55Tested up to: 5.7
    6 Stable tag: 1.1.27
     6Stable tag: 1.1.28
    77Requires PHP: 7.2
    88License: GPLv3
    … …  
    3232
    3333== Changelog ==
     34
     35= 1.1.28 =
     36*Release Date - 28th March 2022*
     37
     38* Can exclude description in the note.
    3439
    3540= 1.1.27 =
Note: See TracChangeset for help on using the changeset viewer.