Changeset 3418016
- Timestamp:
- 12/12/2025 08:33:03 AM (4 months ago)
- Location:
- order-picking-app/trunk
- Files:
-
- 4 edited
-
admin/partials/orderpickingapp-settings-page.php (modified) (9 diffs)
-
includes/class-orderpickingapp.php (modified) (3 diffs)
-
orderpickingapp.php (modified) (1 diff)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
order-picking-app/trunk/admin/partials/orderpickingapp-settings-page.php
r3404834 r3418016 393 393 $orderpickingapp_location_field = get_option('orderpickingapp_location_field'); 394 394 ?> 395 <strong style="font-size: 12px; margin-top:5px;">Custom productfield</strong><br/>395 <strong style="font-size: 12px; margin-top:5px;">Custom location field</strong><br/> 396 396 <select name="orderpickingapp_location_field"> 397 397 <?php … … 413 413 echo '<option value="_sku">SKU</option>'; 414 414 echo '<option value="_global_unique_id">Product | GTIN, UPC, EAN of ISBN</option>'; 415 echo '<option value="variable_global_unique_id">Variation | GTIN, UPC, EAN of ISBN</option>';416 415 foreach( $all_meta_keys as $meta_key ){ 417 416 echo '<option value="' .$meta_key. '" ' . selected($meta_key, $orderpickingapp_ean_field ) . '>' .$meta_key. '</option>'; … … 425 424 $orderpickingapp_additional_barcode_field = get_option('orderpickingapp_additional_barcode_field'); 426 425 ?> 427 <strong style="font-size: 12px; margin-top:5px;">Additional barcode field </strong><br/>426 <strong style="font-size: 12px; margin-top:5px;">Additional barcode field / Box barcode</strong><br/> 428 427 <select name="orderpickingapp_additional_barcode_field"> 429 428 <?php … … 571 570 $i--; ?> 572 571 <div class="form-group <?php echo ($i == 0)? 'duplicate_row' : ''; ?>" style="width: 100%;margin: 10px 0; min-height: 30px;"> 573 <input style="float: left; width: 20%;margin-right: 10px;" type="text" class="form-control app_users_name" name="app_users[][app_users_name]]" value="<?php echo $app_user['app_users_name']; ?>" placeholder="<?php echo $app_user['app_users_name']; ?>"/>574 <input style="float: left; width: 20%;margin-right: 10px;" type="text" class="form-control" name="app_users[][app_users_password]" value="<?php echo $app_user['app_users_password']; ?>" placeholder="<?php echo __( 'Enter user password (optional)', 'orderpickingapp' ); ?>"/>572 <input style="float: left; width: 18%;margin-right: 10px;" type="text" class="form-control app_users_name" name="app_users[][app_users_name]]" value="<?php echo $app_user['app_users_name']; ?>" placeholder="<?php echo $app_user['app_users_name']; ?>"/> 573 <input style="float: left; width: 18%;margin-right: 10px;" type="text" class="form-control" name="app_users[][app_users_password]" value="<?php echo $app_user['app_users_password']; ?>" placeholder="<?php echo __( 'Enter user password (optional)', 'orderpickingapp' ); ?>"/> 575 574 <input style="float: left; width: 8%;margin-right: 10px;" type="number" min="0" max="23" step="1" class="woocommerce-Input woocommerce-Input--text input-text" name="app_users[][app_users_start_time]" value="<?php echo $app_user['app_users_start_time']; ?>" placeholder="Start"/> 576 575 <input style="float: left; width: 8%;margin-right: 10px;" type="number" min="0" max="23" step="1" class="woocommerce-Input woocommerce-Input--text input-text" name="app_users[][app_users_end_time]" value="<?php echo $app_user['app_users_end_time']; ?>" placeholder="End"/> 577 576 <span class="dashicons dashicons-trash remove_picker" style="float: right;margin: 4px 10px;"></span> 578 <select style="float: left; width: 1 8%;margin-right: 10px;" name="app_users_picking_amount">577 <select style="float: left; width: 10%;margin-right: 10px;" name="app_users_picking_amount"> 579 578 <?php if( isset($app_user['app_users_type']) && ( $app_user['app_users_type'] == 'sales' || $app_user['app_users_type'] == 'inventory' ) ): ?> 580 579 <option value="1" selected>-</option> … … 586 585 <?php endif; ?> 587 586 </select> 588 <select class="form-select" style="float: left; width: 1 8%;" name="app_users[][app_users_type]">587 <select class="form-select" style="float: left; width: 10%; margin-right: 10px;" name="app_users[][app_users_type]"> 589 588 <option value="" <?php echo ( !isset($app_user['app_users_type']) || $app_user['app_users_type'] == '')? 'selected' : ''; ?>>Picker</option> 590 589 <?php if( $app_settings['subscription']['pos_addon'] ): ?> … … 596 595 </select> 597 596 598 <select style="float: left; width: 20%;margin-right: 10px;" name="app_users[][app_users_wp_user_id]">597 <select style="float: left; width: 18%;" name="app_users[][app_users_wp_user_id]"> 599 598 <option value=""><?php _e( '— Not connected —', 'orderpickingapp' ); ?></option> 600 599 <?php if ( ! empty( $wp_users ) ) : ?> … … 614 613 <?php if( $noUsers ): ?> 615 614 <div class="form-group duplicate_row" style="width: 100%;margin: 10px 0; min-height: 30px;"> 616 <input style="float: left; width: 20%;margin-right: 10px;" type="text" class="form-control" name="app_users[][app_users_name]" value="" placeholder="Enter user name"/>617 <input style="float: left; width: 20%;margin-right: 10px;" type="text" class="form-control" name="app_users[][app_users_password]" value="" placeholder="<?php echo __( 'Enter user password (optional)', 'orderpickingapp' ); ?>"/>615 <input style="float: left; width: 18%;margin-right: 10px;" type="text" class="form-control" name="app_users[][app_users_name]" value="" placeholder="Enter user name"/> 616 <input style="float: left; width: 18%;margin-right: 10px;" type="text" class="form-control" name="app_users[][app_users_password]" value="" placeholder="<?php echo __( 'Enter user password (optional)', 'orderpickingapp' ); ?>"/> 618 617 <input style="float: left; width: 8%;margin-right: 10px;" type="number" min="0" max="23" step="1" class="woocommerce-Input woocommerce-Input--text input-text" name="app_users[][app_users_start_time]" value="" placeholder="Start"/> 619 618 <input style="float: left; width: 8%;margin-right: 10px;" type="number" min="0" max="23" step="1" class="woocommerce-Input woocommerce-Input--text input-text" name="app_users[][app_users_end_time]" value="" placeholder="End"/> … … 624 623 <?php endfor; ?> 625 624 </select> 626 <select class="form-select" style="float: left; width: 1 8%;" name="app_users[][app_users_type]">625 <select class="form-select" style="float: left; width: 10%;margin-right: 10px;" name="app_users[][app_users_type]"> 627 626 <option value="">Picker</option> 628 627 <?php if( $app_settings['subscription']['pos_addon'] ): ?> … … 634 633 </select> 635 634 636 <select style="float: left; width: 20%;margin-right: 10px;" name="app_users[][app_users_wp_user_id]">635 <select style="float: left; width: 10%;" name="app_users[][app_users_wp_user_id]"> 637 636 <option value=""><?php _e( '— Not connected —', 'orderpickingapp' ); ?></option> 638 637 <?php if ( ! empty( $wp_users ) ) : ?> -
order-picking-app/trunk/includes/class-orderpickingapp.php
r3404834 r3418016 550 550 551 551 $item->update_meta_data('picking_status', 'completed'); 552 $Order->add_order_note('Order Picking App | Order item with SKU ' .$product['sku']. ' changed from ' . $product_processed_stock . ' to ' .$new_order_item_amount);552 $Order->add_order_note('Order Picking App | Order item with SKU ' .$product['sku']. ' changed from ' . $product_processed_stock . ' to ' .$new_order_item_amount); 553 553 } 554 554 elseif ($picked_amount >= $product_processed_stock) { … … 2552 2552 } elseif (isset($user_order_claims) && !empty($user_order_claims)) { 2553 2553 wp_send_json($user_order_claims); 2554 } else if (empty($appuser)){2554 } else { 2555 2555 wp_send_json(array( 2556 2556 'total_picking_orders' => $total_picking_orders, … … 2558 2558 'total_backorders' => $total_backorders, 2559 2559 )); 2560 } else {2561 wp_send_json(array());2562 2560 } 2563 2561 header("HTTP/1.1 401 Unauthorized"); -
order-picking-app/trunk/orderpickingapp.php
r3404834 r3418016 3 3 * Plugin Name: Order Picking App 4 4 * Description: Make your life easier by using the Orderpicking App. You'll never be inefficient if the Orderpicking App is installed in your store. We assist you in all aspects of your webshop. From intelligent selecting to order packing, we have you covered. Connecting the Orderpicking App to your Woocommerce webshop is simple and quick. Within an hour, you'll be online with the Orderpicking App. You're able to pick and pack your orders three times faster and with greater accuracy. 5 * Version: 2.2. 85 * Version: 2.2.9 6 6 * Author: Arture | PHP Professionals 7 7 * Author URI: http://arture.nl -
order-picking-app/trunk/readme.txt
r3404834 r3418016 4 4 Tags: orderpicking, picking, packing, warehouse, shipping, wms 5 5 Requires at least: 6.0 6 Tested up to: 6. 8.37 Stable tag: 2.2. 86 Tested up to: 6.9 7 Stable tag: 2.2.9 8 8 Requires PHP: 8.0 9 9 License: GPLv2 or later … … 59 59 == Changelog == 60 60 61 = 2.2.9 = 62 * Styling update for picker/user tab 63 61 64 = 2.2.8 = 62 65 * Added customer fields for billing and shipping to POS order create
Note: See TracChangeset
for help on using the changeset viewer.