Changeset 3201495

Timestamp:

12/03/2024 09:46:15 AM (15 months ago)

Author:

robertosnap

Message:

Update to version 7.8.0 from GitHub

Location:

logistra-woocommerce-integrasjon-fra-wildrobot-app

Files:

• tags/7.8.0 (copied) (copied from logistra-woocommerce-integrasjon-fra-wildrobot-app/trunk)
• tags/7.8.0/README.txt (modified) (2 diffs)
• tags/7.8.0/admin/class-wildrobot-logistra-admin.php (modified) (1 diff)
• tags/7.8.0/admin/partials/frontend/admin.a9f4ab44.js (deleted)
• tags/7.8.0/admin/partials/frontend/admin.d49fdc4a.js (added)
• tags/7.8.0/includes/class-wildrobot-logistra-consignment-order.php (modified) (1 diff)
• tags/7.8.0/includes/class-wildrobot-logistra.php (modified) (1 diff)
• tags/7.8.0/logistra-robots.php (modified) (2 diffs)
• tags/7.8.0/public/partials/frontend/public.a9f4ab44.js (deleted)
• tags/7.8.0/public/partials/frontend/public.d49fdc4a.js (added)
• trunk/README.txt (modified) (2 diffs)
• trunk/admin/class-wildrobot-logistra-admin.php (modified) (1 diff)
• trunk/admin/partials/frontend/admin.a9f4ab44.js (deleted)
• trunk/admin/partials/frontend/admin.d49fdc4a.js (added)
• trunk/includes/class-wildrobot-logistra-consignment-order.php (modified) (1 diff)
• trunk/includes/class-wildrobot-logistra.php (modified) (1 diff)
• trunk/logistra-robots.php (modified) (2 diffs)
• trunk/public/partials/frontend/public.a9f4ab44.js (deleted)
• trunk/public/partials/frontend/public.d49fdc4a.js (added)

logistra-woocommerce-integrasjon-fra-wildrobot-app/tags/7.8.0/README.txt

@@ -4 +4 @@
 Tags: Cargonizer, Logistra, WildRobot, Profrakt, Frakt
 Requires at least: 5.1
-Tested up to: 6.6.2
-Stable tag: 7.7.3
+Tested up to: 6.7.1
+Stable tag: 7.8.0
 WC requires at least: 3.0.0
-WC tested up to: 9.3.2
+WC tested up to: 9.4.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -50 +50 @@
 
 
+= 7.8.0 =
+* FIX Order actions list buttons now properly aligned in admin.
+
 = 7.7.3 =
 * FIX Strip special characters from description for separate packages.

logistra-woocommerce-integrasjon-fra-wildrobot-app/tags/7.8.0/admin/class-wildrobot-logistra-admin.php

@@ -33 +33 @@
 
 
-    public function order_actions($order)
-    {
-        // We need to attach some data to the DOM element to instantiate the REACT components correctly and wihtout extra backend calls
-        // To show if order has been sent
+    public function order_actions($actions, $order)
+    {
         $order_id = $order->get_id();
         $sent = $order->get_meta('logistra-robots-sent', true) == 'yes' ? 'true' : 'false';
         $show_label_download = get_option("wildrobot_logistra_show_label_after_send_order") === "yes" ? 'true' : 'false';
         $label_url = $order->get_meta('logistra-robots-freight-label-url', true);
-        // To distiguish each button /vue instance
-
+
+        // Add send order action if not hidden
         if (get_option("wildrobot_logistra_hide_send_buttons", "no") !== "yes") {
-            echo "<div class='wildrobot-logistra-order-action-send' data-id=" . $order_id . ' data-sent=' . $sent . ' data-label=' . $show_label_download . ' data-labelUrl=' . $label_url . '></div>';
-        }
+            $actions['wildrobot_send'] = array(
+                'url'       => add_query_arg(array(
+                    'action' => 'wildrobot_logistra_send_order',
+                    'order_id' => $order_id,
+                    'sent' => $sent,
+                    'show_label' => $show_label_download,
+                    'label_url' => urlencode($label_url)
+                ), admin_url('admin-ajax.php')),
+                'name'      => __('Send ordre', 'wildrobot-logistra'),
+                'action'    => "view wildrobot_send wildrobot-logistra-order-action-send wc-action-button-wildrobot_send"
+            );
+        }
+
+        // Add override action if not hidden
         if (get_option("wildrobot_logistra_hide_override_buttons", "no") !== "yes") {
-            echo "<div class='wildrobot-logistra-order-action-override' data-id=" . $order_id . ' data-sent=' . $sent . ' ></div>';
-        }
+            $actions['wildrobot_override'] = array(
+                'url'       => add_query_arg(array(
+                    'action' => 'wildrobot_logistra_override_order',
+                    'order_id' => $order_id,
+                    'sent' => $sent
+                ), admin_url('admin-ajax.php')),
+                'name'      => __('Override', 'wildrobot-logistra'),
+                'action'    => "view wildrobot_override wildrobot-logistra-order-action-override wc-action-button-wildrobot_override"
+            );
+        }
+
+        // Add picklist action if active
         if (get_option("wildrobot_logistra_picklist_active") === "yes") {
             $picked = $order->get_meta('wildrobot-logistra-picklist-created', true) == 'yes' ? 'true' : 'false';
-            echo "<div class='wildrobot-logistra-picklist-order' data-id=" . $order_id . ' data-picked=' . $picked . ' ></div>';
-        }
+            $actions['wildrobot_picklist'] = array(
+                'url'       => add_query_arg(array(
+                    'action' => 'wildrobot_logistra_picklist',
+                    'order_id' => $order_id,
+                    'picked' => $picked
+                ), admin_url('admin-ajax.php')),
+                'name'      => __('Plukkliste', 'wildrobot-logistra'),
+                'action'    => "view wildrobot_picklist wildrobot-logistra-picklist-order wc-action-button-wildrobot_picklist"
+            );
+        }
+
+        return $actions;
     }
 

logistra-woocommerce-integrasjon-fra-wildrobot-app/tags/7.8.0/includes/class-wildrobot-logistra-consignment-order.php

@@ -321 +321 @@
         if ($use_product_names) {
             $name_array = array_map(function ($product) {
-                return $product->get_quantity() . 'x' . $product->get_name() . ',';
+                return $product->get_quantity() . 'x' . wp_strip_all_tags($product->get_name()) . ',';
             }, $items);
             $transport_description = join(' ', $name_array);

logistra-woocommerce-integrasjon-fra-wildrobot-app/tags/7.8.0/includes/class-wildrobot-logistra.php

@@ -195 +195 @@
         $this->loader->add_filter('script_loader_tag', $admin, 'special_script_enqueue_tags', 10, 3);
         $this->loader->add_filter('admin_menu', $admin, 'wildrobot_woocommerce_submenu_link', 99);
-        $this->loader->add_filter('woocommerce_admin_order_actions_end', $admin, 'order_actions');
+        $this->loader->add_filter('woocommerce_admin_order_actions', $admin, 'order_actions', 10, 2);
         $this->loader->add_filter('add_meta_boxes', $admin, 'edit_order_deliver_order_box');
         $this->loader->add_filter('add_meta_boxes', $admin, 'edit_order_return_order_box');

logistra-woocommerce-integrasjon-fra-wildrobot-app/tags/7.8.0/logistra-robots.php

@@ -17 +17 @@
  * Plugin URI:        https://wildrobot.app/wildrobot-logistra-cargonizer-woocommerce-integrasjon/
  * Description:       Integrate WooCommerce with Logistra Cargonizer or Profrakt - Freight administration made easy by Wildrobot!
- * Version:           7.7.3
+ * Version:           7.8.0
  * Author:            Robertosnap
  * Author URI:        https://wildrobot.app/wildrobot-logistra-cargonizer-woocommerce-integrasjon/
@@ -39 +39 @@
  * Rename this for your plugin and update it as you release new versions.
  */
-define('WILDROBOT_LOGISTRA_VERSION', '7.7.3');
+define('WILDROBOT_LOGISTRA_VERSION', '7.8.0');
 
 /**

logistra-woocommerce-integrasjon-fra-wildrobot-app/trunk/README.txt

@@ -4 +4 @@
 Tags: Cargonizer, Logistra, WildRobot, Profrakt, Frakt
 Requires at least: 5.1
-Tested up to: 6.6.2
-Stable tag: 7.7.3
+Tested up to: 6.7.1
+Stable tag: 7.8.0
 WC requires at least: 3.0.0
-WC tested up to: 9.3.2
+WC tested up to: 9.4.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -50 +50 @@
 
 
+= 7.8.0 =
+* FIX Order actions list buttons now properly aligned in admin.
+
 = 7.7.3 =
 * FIX Strip special characters from description for separate packages.

logistra-woocommerce-integrasjon-fra-wildrobot-app/trunk/admin/class-wildrobot-logistra-admin.php

@@ -33 +33 @@
 
 
-    public function order_actions($order)
-    {
-        // We need to attach some data to the DOM element to instantiate the REACT components correctly and wihtout extra backend calls
-        // To show if order has been sent
+    public function order_actions($actions, $order)
+    {
         $order_id = $order->get_id();
         $sent = $order->get_meta('logistra-robots-sent', true) == 'yes' ? 'true' : 'false';
         $show_label_download = get_option("wildrobot_logistra_show_label_after_send_order") === "yes" ? 'true' : 'false';
         $label_url = $order->get_meta('logistra-robots-freight-label-url', true);
-        // To distiguish each button /vue instance
-
+
+        // Add send order action if not hidden
         if (get_option("wildrobot_logistra_hide_send_buttons", "no") !== "yes") {
-            echo "<div class='wildrobot-logistra-order-action-send' data-id=" . $order_id . ' data-sent=' . $sent . ' data-label=' . $show_label_download . ' data-labelUrl=' . $label_url . '></div>';
-        }
+            $actions['wildrobot_send'] = array(
+                'url'       => add_query_arg(array(
+                    'action' => 'wildrobot_logistra_send_order',
+                    'order_id' => $order_id,
+                    'sent' => $sent,
+                    'show_label' => $show_label_download,
+                    'label_url' => urlencode($label_url)
+                ), admin_url('admin-ajax.php')),
+                'name'      => __('Send ordre', 'wildrobot-logistra'),
+                'action'    => "view wildrobot_send wildrobot-logistra-order-action-send wc-action-button-wildrobot_send"
+            );
+        }
+
+        // Add override action if not hidden
         if (get_option("wildrobot_logistra_hide_override_buttons", "no") !== "yes") {
-            echo "<div class='wildrobot-logistra-order-action-override' data-id=" . $order_id . ' data-sent=' . $sent . ' ></div>';
-        }
+            $actions['wildrobot_override'] = array(
+                'url'       => add_query_arg(array(
+                    'action' => 'wildrobot_logistra_override_order',
+                    'order_id' => $order_id,
+                    'sent' => $sent
+                ), admin_url('admin-ajax.php')),
+                'name'      => __('Override', 'wildrobot-logistra'),
+                'action'    => "view wildrobot_override wildrobot-logistra-order-action-override wc-action-button-wildrobot_override"
+            );
+        }
+
+        // Add picklist action if active
         if (get_option("wildrobot_logistra_picklist_active") === "yes") {
             $picked = $order->get_meta('wildrobot-logistra-picklist-created', true) == 'yes' ? 'true' : 'false';
-            echo "<div class='wildrobot-logistra-picklist-order' data-id=" . $order_id . ' data-picked=' . $picked . ' ></div>';
-        }
+            $actions['wildrobot_picklist'] = array(
+                'url'       => add_query_arg(array(
+                    'action' => 'wildrobot_logistra_picklist',
+                    'order_id' => $order_id,
+                    'picked' => $picked
+                ), admin_url('admin-ajax.php')),
+                'name'      => __('Plukkliste', 'wildrobot-logistra'),
+                'action'    => "view wildrobot_picklist wildrobot-logistra-picklist-order wc-action-button-wildrobot_picklist"
+            );
+        }
+
+        return $actions;
     }
 

logistra-woocommerce-integrasjon-fra-wildrobot-app/trunk/includes/class-wildrobot-logistra-consignment-order.php

@@ -321 +321 @@
         if ($use_product_names) {
             $name_array = array_map(function ($product) {
-                return $product->get_quantity() . 'x' . $product->get_name() . ',';
+                return $product->get_quantity() . 'x' . wp_strip_all_tags($product->get_name()) . ',';
             }, $items);
             $transport_description = join(' ', $name_array);

logistra-woocommerce-integrasjon-fra-wildrobot-app/trunk/includes/class-wildrobot-logistra.php

@@ -195 +195 @@
         $this->loader->add_filter('script_loader_tag', $admin, 'special_script_enqueue_tags', 10, 3);
         $this->loader->add_filter('admin_menu', $admin, 'wildrobot_woocommerce_submenu_link', 99);
-        $this->loader->add_filter('woocommerce_admin_order_actions_end', $admin, 'order_actions');
+        $this->loader->add_filter('woocommerce_admin_order_actions', $admin, 'order_actions', 10, 2);
         $this->loader->add_filter('add_meta_boxes', $admin, 'edit_order_deliver_order_box');
         $this->loader->add_filter('add_meta_boxes', $admin, 'edit_order_return_order_box');

logistra-woocommerce-integrasjon-fra-wildrobot-app/trunk/logistra-robots.php

@@ -17 +17 @@
  * Plugin URI:        https://wildrobot.app/wildrobot-logistra-cargonizer-woocommerce-integrasjon/
  * Description:       Integrate WooCommerce with Logistra Cargonizer or Profrakt - Freight administration made easy by Wildrobot!
- * Version:           7.7.3
+ * Version:           7.8.0
  * Author:            Robertosnap
  * Author URI:        https://wildrobot.app/wildrobot-logistra-cargonizer-woocommerce-integrasjon/
@@ -39 +39 @@
  * Rename this for your plugin and update it as you release new versions.
  */
-define('WILDROBOT_LOGISTRA_VERSION', '7.7.3');
+define('WILDROBOT_LOGISTRA_VERSION', '7.8.0');
 
 /**