Changeset 3416278

Timestamp:

12/10/2025 10:18:10 AM (2 months ago)

Author:

jneshipping

Message:

Update to 1.3.0

Location:

jne-shipping-official/trunk

Files:

• admin/includes/class-jne-admin-shipping-cost-adjustment.php (modified) (1 diff)
• admin/partials/jne-woocommerce-admin-shipping-cost-adjustments-display.php (modified) (1 diff)
• composer.json (modified) (1 diff)
• jne-shipping-official.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)

jne-shipping-official/trunk/admin/includes/class-jne-admin-shipping-cost-adjustment.php

@@ -215 +215 @@
       }
 
-      // All checks passed, add to applicable
+      // All checks passed, calculate specificity score
+      $specificity_score = 0;
+      
+      // District match = most specific (4 points)
+      if (!empty($adjustment['districts']) && is_array($adjustment['districts'])) {
+        $cities_count = !empty($adjustment['cities']) ? count($adjustment['cities']) : 0;
+        if ($cities_count === 1 && in_array($district_name, $adjustment['districts'])) {
+          $specificity_score += 4;
+        }
+      }
+      
+      // City match = specific (3 points)
+      if (!empty($adjustment['cities']) && is_array($adjustment['cities'])) {
+        $provinces_count = !empty($adjustment['provinces']) ? count(array_filter($adjustment['provinces'], function($p) {
+          return $p !== 'all';
+        })) : 0;
+        if ($provinces_count === 1 && in_array($city_name, $adjustment['cities'])) {
+          $specificity_score += 3;
+        }
+      }
+      
+      // Province match = moderate (2 points)
+      if (!empty($adjustment['provinces']) && is_array($adjustment['provinces'])) {
+        if (!in_array('all', $adjustment['provinces'])) {
+          $province_match = false;
+          foreach ($adjustment['provinces'] as $province) {
+            if (is_array($province) && isset($province['name']) && $province['name'] === $province_name) {
+              $province_match = true;
+              break;
+            } elseif (is_string($province) && $province === $province_name) {
+              $province_match = true;
+              break;
+            }
+          }
+          if ($province_match) {
+            $specificity_score += 2;
+          }
+        }
+      }
+      
+      // Service match (not "all") = less specific (1 point)
+      if (!empty($adjustment['services']) && is_array($adjustment['services'])) {
+        if (!in_array('all', $adjustment['services']) && in_array($service_code, $adjustment['services'])) {
+          $specificity_score += 1;
+        }
+      }
+      
+      // Add adjustment with specificity score
+      $adjustment['_specificity_score'] = $specificity_score;
       $applicable[] = $adjustment;
     }
+
+    // Sort by specificity score (highest first), then by created_at (oldest first for tie-breaking)
+    usort($applicable, function($a, $b) {
+      $score_a = $a['_specificity_score'] ?? 0;
+      $score_b = $b['_specificity_score'] ?? 0;
+      
+      if ($score_a !== $score_b) {
+        return $score_b <=> $score_a; // Descending order
+      }
+      
+      // If same specificity, use creation date (older = higher priority)
+      $created_a = $a['created_at'] ?? '';
+      $created_b = $b['created_at'] ?? '';
+      return strcmp($created_a, $created_b);
+    });
 
     return $applicable;

jne-shipping-official/trunk/admin/partials/jne-woocommerce-admin-shipping-cost-adjustments-display.php

@@ -224 +224 @@
   <?php else: ?>
     <!-- List View -->
+    <!-- Priority Rules Info Box -->
+    <div class="notice notice-info" style="margin: 20px 0; padding: 0; border-left-color: #2271b1; background: #fff;">
+      <div style="padding: 12px 15px; cursor: pointer;" id="priority-info-toggle" onclick="jQuery('#priority-info-content').slideToggle();">
+        <div style="display: flex; align-items: center; justify-content: space-between;">
+          <div style="display: flex; align-items: center; gap: 10px;">
+            <span class="dashicons dashicons-info" style="color: #2271b1; font-size: 18px;"></span>
+            <strong style="color: #1d2327; font-size: 13px;">
+              <?php esc_html_e('How Rules Priority Works', 'jne-shipping-official'); ?>
+            </strong>
+          </div>
+          <span class="dashicons dashicons-arrow-down-alt2" id="priority-info-arrow" style="color: #2271b1; transition: transform 0.3s;"></span>
+        </div>
+      </div>
+      <div id="priority-info-content" style="display: none; padding: 0 15px 15px 15px; border-top: 1px solid #c3c4c7;">
+        <p style="margin: 12px 0; color: #50575e; line-height: 1.6; font-size: 13px;">
+          <?php esc_html_e('When multiple rules match a shipping request, the system automatically selects the most specific rule based on priority levels:', 'jne-shipping-official'); ?>
+        </p>
+        <div style="background: #f0f6fc; border: 1px solid #c3c4c7; border-radius: 4px; padding: 12px; margin-top: 10px;">
+          <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 12px; font-size: 13px;">
+            <div style="display: flex; align-items: center; gap: 10px; padding: 6px 0;">
+              <span style="display: inline-flex; align-items: center; justify-content: center; width: 28px; height: 28px; background: #2271b1; color: white; border-radius: 50%; font-weight: 600; font-size: 12px; flex-shrink: 0;">1</span>
+              <div>
+                <strong style="color: #1d2327; display: block;"><?php esc_html_e('District Match', 'jne-shipping-official'); ?></strong>
+                <small style="color: #646970;"><?php esc_html_e('Highest Priority', 'jne-shipping-official'); ?></small>
+              </div>
+            </div>
+            <div style="display: flex; align-items: center; gap: 10px; padding: 6px 0;">
+              <span style="display: inline-flex; align-items: center; justify-content: center; width: 28px; height: 28px; background: #2271b1; color: white; border-radius: 50%; font-weight: 600; font-size: 12px; flex-shrink: 0;">2</span>
+              <div>
+                <strong style="color: #1d2327; display: block;"><?php esc_html_e('City Match', 'jne-shipping-official'); ?></strong>
+                <small style="color: #646970;"><?php esc_html_e('High Priority', 'jne-shipping-official'); ?></small>
+              </div>
+            </div>
+            <div style="display: flex; align-items: center; gap: 10px; padding: 6px 0;">
+              <span style="display: inline-flex; align-items: center; justify-content: center; width: 28px; height: 28px; background: #2271b1; color: white; border-radius: 50%; font-weight: 600; font-size: 12px; flex-shrink: 0;">3</span>
+              <div>
+                <strong style="color: #1d2327; display: block;"><?php esc_html_e('Province Match', 'jne-shipping-official'); ?></strong>
+                <small style="color: #646970;"><?php esc_html_e('Medium Priority', 'jne-shipping-official'); ?></small>
+              </div>
+            </div>
+            <div style="display: flex; align-items: center; gap: 10px; padding: 6px 0;">
+              <span style="display: inline-flex; align-items: center; justify-content: center; width: 28px; height: 28px; background: #2271b1; color: white; border-radius: 50%; font-weight: 600; font-size: 12px; flex-shrink: 0;">4</span>
+              <div>
+                <strong style="color: #1d2327; display: block;"><?php esc_html_e('Service Match', 'jne-shipping-official'); ?></strong>
+                <small style="color: #646970;"><?php esc_html_e('Lowest Priority', 'jne-shipping-official'); ?></small>
+              </div>
+            </div>
+          </div>
+          <p style="margin: 12px 0 0 0; padding-top: 12px; border-top: 1px solid #c3c4c7; color: #50575e; font-size: 12px; line-height: 1.5;">
+            <span style="display: inline-block; margin-right: 6px;">💡</span>
+            <strong><?php esc_html_e('Important:', 'jne-shipping-official'); ?></strong>
+            <?php esc_html_e('Only one rule is applied per shipping calculation. If multiple rules have the same priority level, the oldest rule (by creation date) takes precedence.', 'jne-shipping-official'); ?>
+          </p>
+        </div>
+      </div>
+    </div>
+    
+    <script>
+    jQuery(document).ready(function($) {
+      $('#priority-info-toggle').on('click', function() {
+        var $arrow = $('#priority-info-arrow');
+        if ($('#priority-info-content').is(':visible')) {
+          $arrow.css('transform', 'rotate(0deg)');
+        } else {
+          $arrow.css('transform', 'rotate(180deg)');
+        }
+      });
+    });
+    </script>
+    
     <div class="card" style="margin: 20px 0;">
       <div class="card-body">

jne-shipping-official/trunk/composer.json

@@ -2 +2 @@
     "name": "jne-shipping/jne-shipping-official",
     "description": "WordPress plugin integrated with WooCommerce for JNE shipping services",
-    "version": "1.2.2",
+    "version": "1.3.0",
     "type": "wordpress-plugin",
     "license": "GPL-2.0+",

jne-shipping-official/trunk/jne-shipping-official.php

@@ -20 +20 @@
  * Plugin Name:       JNE Shipping Official
  * Description:       WordPress plugin integrated with WooCommerce for JNE shipping services
- * Version:           1.2.2
+ * Version:           1.3.0
  * Author:            PT. Tiki Jalur Nugraha Ekakurir
  * Author URI:        https://jne.co.id/
@@ -48 +48 @@
  * Rename this for your plugin and update it as you release new versions.
  */
-define('JNESHOF_PLUGIN_VERSION', '1.2.2');
+define('JNESHOF_PLUGIN_VERSION', '1.3.0');
 
 /**

jne-shipping-official/trunk/readme.txt

@@ -4 +4 @@
 Tags: shipping, woocommerce, jne, indonesia, courier
 Requires at least: 5.0
-Tested up to: 6.8
+Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 1.2.2
+Stable tag: 1.3.0
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
@@ -90 +90 @@
 
 == Changelog ==
+
+= 1.3.0 =
+* Added: Priority system for Shipping Cost Adjustments - Rules are now automatically prioritized based on specificity (District > City > Province > Service)
+* Added: Information panel in Shipping Cost Adjustments page explaining how rules priority works
+* Improved: Character length validation for tracking number generation - All fields now respect API documentation limits and automatically truncate if exceeded
+* Fixed: String truncation handles multibyte characters correctly using mb_strcut for proper byte-based truncation
+* Enhanced: User experience with collapsible info box showing priority rules explanation
 
 = 1.2.2 =
@@ -188 +195 @@
 == Upgrade Notice ==
 
+= 1.3.0 =
+Major update: Enhanced Shipping Cost Adjustments with intelligent priority system. Rules are now automatically prioritized based on specificity (most specific rule wins). Added character length validation for API compliance. All tracking number fields are now automatically truncated to match API documentation limits. Includes new user-friendly information panel explaining how rules priority works. Recommended for all users.
+
 = 1.2.2 =
 Bug fixes and improvements: Fixed CTC service labeling (now displays as REG), improved dashboard calculations, fixed SKU display in shipping labels, and added pickup request validation. Recommended for all users.