WordPress.org
Get WordPress

Plugin Directory

Changeset 2847484


Ignore:
Timestamp:
01/12/2023 03:09:10 PM (3 years ago)
Author:
shiptimizeplugins
Message:

v3.1.65 - do not export virtual products and virtual orders by default

Location:
shiptimize-for-woocommerce/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • shiptimize-for-woocommerce/trunk/constants.php

    r2830540 r2847484  
    44define( 'SHIPTIMIZE_API_URL', 'https://api.pakketmail.nl/v3' );
    55define( 'SHIPTIMIZE_BRAND', 'Shiptimize' );
    6 define( 'SHIPTIMIZE_VERSION', '3.1.64' );
     6define( 'SHIPTIMIZE_VERSION', '3.1.65' );
    77define( 'SHIPTIMIZE_CREATE_ACCOUNT', 'https://www.shiptimize.me/quote/' );
    88define( 'SHIPTIMIZE_CHECKOUT', 0);

  • shiptimize-for-woocommerce/trunk/includes/admin/class-shiptimize-options-ui-default.php

    r2726206 r2847484  
    408408        <input type='checkbox' name="shiptimize_labelagree" value="1" <?php echo get_option('shiptimize_labelagree') ? 'checked': '' ?>/> <?php echo $shiptimize->translate('labelagree'); ?>
    409409      </div>
    410      
     410
    411411      <?php // Waiting for approval to finish integration
    412412      if( is_plugin_active( 'mh-woocommerce-table-rate-shipping-plus/mh-wc-table-rate-plus.php' ) ): ?>
    413413          <h2>Table Rate Shipping Plus</h2>
    414414          <?php $this->print_table_rate_shipping_plus();  ?>
    415 
    416415       <?php endif;
     416
    417417      $this->print_brazilian_fields(); 
    418418      //If there's a marketplace plugin display aditional marketplace Settings here
    … …  
    423423
    424424      $this->print_hide_not_free();
    425        submit_button();   ?>
     425      ?>
     426
     427      <div class='shiptimize-settings__section'>
     428        <h2><?php echo $shiptimize->translate('exportvirtualtitle');?></h2>
     429        <input type='checkbox' name="shiptimize_export_virtual_products" value="1" <?php echo get_option('shiptimize_export_virtual_products') ? 'checked': '' ?>/> <?php echo $shiptimize->translate('exportvirtualproducts'); ?> 
     430        <br/><input type='checkbox' name="shiptimize_export_virtual_orders" value="1" <?php echo get_option('shiptimize_export_virtual_orders') ? 'checked': '' ?>/> <?php echo $shiptimize->translate('exportvirtualorders'); ?>
     431      </div>     
    426432  <?php
     433      submit_button();   
    427434  }
    428435

  • shiptimize-for-woocommerce/trunk/includes/admin/class-shiptimize-options-ui.php

    r2817728 r2847484  
    5151  protected $api = null;
    5252
     53  /***
     54   * Exclude virtual products
     55   */
     56  protected $exclude_virtual_products = 1;
     57
     58  /**
     59   * Exclude virtual orders
     60   * */
     61  protected $exclude_virtual_orders = 1;
     62
     63
     64
    5365  public function __construct() {   
    5466    $this->actions();   
    … …  
    164176    register_setting( 'shiptimize_group' , 'shiptimize_number' );
    165177
     178    register_setting( 'shiptimize_group' , 'shiptimize_export_virtual_products' );
     179    register_setting( 'shiptimize_group' , 'shiptimize_export_virtual_orders' );
    166180
    167181    register_setting( 'shiptimize_group' , 'shiptimize_settings', array($this,'settings_saved'));

  • shiptimize-for-woocommerce/trunk/includes/class-woo-shiptimize-order.php

    r2830540 r2847484  
    3434  );
    3535
     36  /**
     37   *  This order contains only virtual products
     38   */
     39  protected $is_virtual = 0;
    3640
    3741  /**
    … …  
    5660    return $this->ShopItemId;
    5761  }
     62
     63  /**
     64  * @override
     65  * @return boolean true if this order is valid
     66  */
     67  public function is_valid()
     68  {
     69    $notvirtual = (get_option('shiptimize_export_virtual_orders') || !$this->is_virtual);
     70
     71    if(!$notvirtual) {
     72     array_push($this->errors, "Only virtual products in order");
     73    }
     74
     75    return parent::is_valid() && $notvirtual;
     76  }
    5877
    5978  /**
    … …  
    166185    $description = '';
    167186    $this->ShipmentItems = array();
    168 
     187    $exportvirtualproducts = get_option('shiptimize_export_virtual_products');
     188
     189    $is_virtual = 1;
    169190    foreach( $items as $item ) {   
    170191      $product = $item->get_product();
     192      $includeproduct = $exportvirtualproducts || !$product->is_virtual();
    171193
    172194//    Remember that not all items are products
    173       if($product){ 
    174 
     195      if($product && $includeproduct){ 
     196        $is_virtual = 0;
    175197        $qty = $item->get_quantity();
    176198        $item_weight = 0;
    … …  
    204226    }
    205227
    206    
     228    $this->is_virtual = $is_virtual;
     229
    207230    // @deprecated in favor of item lists
    208231    // $this->Description = $this->escape_text_data($description);

  • shiptimize-for-woocommerce/trunk/includes/class-woo-shiptimize.php

    r2819261 r2847484  
    756756
    757757    if( isset($pickup_points->Error) && $pickup_points->Error->Id == 401 ){
    758       WooShiptimize::refresh_token(); //try to get a new token once!
     758      WooShiptimize::refresh_token(); // Try to get a new token once!
    759759      $pickup_points  = $api->get_pickup_locations( $address, $shipping_method_id);
    760760    }

  • shiptimize-for-woocommerce/trunk/includes/core/lang/de.php

    r2800002 r2847484  
    8989    <li>Fügen Sie diese neuen Schlüssel in das Feld GLS Credentials in den GLS-Einstellungen hier in WordPress ein und klicken Sie auf die Schaltfläche "Änderungen speichern".</li>
    9090</ol>',
    91 'hideifclasspresent' => 'Wenn mindestens ein Artikel im Warenkorb diese Klassen enthält, zeigen Sie diese Methode nicht an'
     91'hideifclasspresent' => 'Wenn mindestens ein Artikel im Warenkorb diese Klassen enthält, zeigen Sie diese Methode nicht an',
     92    'exportvirtualtitle' => 'Virtuelle Produkte und virtuelle Aufträge',
     93    'exportvirtualorders' => 'Exportaufträge, die nur virtuelle Produkte enthalten',
     94    'exportvirtualproducts' => 'Beim Exportieren virtuelle Produkte an Bestellungen anhängen'
    9295);

  • shiptimize-for-woocommerce/trunk/includes/core/lang/en.php

    r2800002 r2847484  
    172172    'hidenotfree' => 'If at least one shipping method is available with cost 0, hide any shipping method with cost > 0',
    173173    'hidenotfreetitle' => 'Hide Shipping Methods',
    174     'excludeclasses' => 'If at least one item in cart contains of these classes do not display this method'
     174    'excludeclasses' => 'If at least one item in cart contains of these classes do not display this method',
     175    'exportvirtualtitle' => 'Virtual products & Virtual orders',
     176    'exportvirtualorders' => 'Export orders containing only virtual products',
     177    'exportvirtualproducts' => 'When exporting append virtual products to orders'
    175178); 

  • shiptimize-for-woocommerce/trunk/includes/core/lang/es.php

    r2800002 r2847484  
    180180    'hidenotfree' => 'Si hay al menos un método de envío disponible con coste 0, ocultar cualquier método de envío con coste > 0',
    181181    'hidenotfreetitle' => 'Ocultar métodos de envío',
    182     'hideifclasspresent' => 'Si al menos un artículo en el carrito contiene de estas clases, no muestre este método'
     182    'hideifclasspresent' => 'Si al menos un artículo en el carrito contiene de estas clases, no muestre este método',
     183    'exportvirtualtitle' => 'Productos y pedidos virtuales',
     184    'exportvirtualorders' => 'Exportar pedidos que sólo contengan productos virtuales',
     185    'exportvirtualproducts' => 'Al exportar, añadir productos virtuales a los pedidos'
    183186); 

  • shiptimize-for-woocommerce/trunk/includes/core/lang/nl.php

    r2800002 r2847484  
    135135    <li>Plak deze nieuwe sleutels in het Shiptimize Credentials veld in de Shiptimize Instellingen hier in WordPress en klik op de "Wijzigingen opslaan" knop.</li>
    136136</ol>',
    137 'hideifclasspresent' => 'Als ten minste één item in de winkelwagen van deze klassen bevat, wordt deze methode niet weergegeven'
     137'hideifclasspresent' => 'Als ten minste één item in de winkelwagen van deze klassen bevat, wordt deze methode niet weergegeven',
     138    'exportvirtualtitle' => 'Virtuele producten & Virtuele bestellingen',
     139    'exportvirtualorders' => 'Exporteer orders welke enkel virtuele producten bevatten',
     140    'exportvirtualproducts' => 'Voeg naast fysieke producten ook virtuele producten toe bij exporteren van een order'
    138141); 

  • shiptimize-for-woocommerce/trunk/includes/core/lang/pt.php

    r2800002 r2847484  
    187187    'hidenotfree' => 'Se existir pelo menos um método de envio com custo zero, esconder qualquer método de envio com custo superior a zero',
    188188    'hidenotfreetitle' => 'Esconder métodos de envio',
    189     'hideifclasspresent' => 'Se pelo menos um item no carrinho contiver uma das classes assinaladas, não mostrar este método de envio'
     189    'hideifclasspresent' => 'Se pelo menos um item no carrinho contiver uma das classes assinaladas, não mostrar este método de envio',
     190    'exportvirtualtitle' => 'Encomendas e produtos Virtuais',
     191    'exportvirtualorders' => 'Exportar encomendas que contenham apenas produtos virtuais',
     192    'exportvirtualproducts' => 'Ao exportar encomendas incluir também os produtos virtuais'
    190193); 

  • shiptimize-for-woocommerce/trunk/readme.txt

    r2830547 r2847484  
    5858
    5959== Changelog ==
     60= 3.1.65 - 2023-01-12 =
     61* Enhancement - By default, do not export orders that contain only virtual products, do not include virtual products when exporting.
    6062
    6163= 3.1.64 - 2022-12-07 =

  • shiptimize-for-woocommerce/trunk/shiptimize.php

    r2830540 r2847484  
    33 * Plugin Name: Shiptimize for WooCommerce
    44 * Description: Shiptimize for WooCommerce 
    5  * Version: 3.1.64
     5 * Version: 3.1.65
    66 * Author: Shiptimize
    77 * Author URI: https://shiptimize.me
Note: See TracChangeset for help on using the changeset viewer.