update

2026-03-10 21:37:24 +01:00
parent 5bce68c56b
commit 9d70ea0547
37 changed files with 1534 additions and 282 deletions
--- a/admin/templates/shop-order/order-details-custom-script.php
+++ b/admin/templates/shop-order/order-details-custom-script.php
@@ -1,3 +1,30 @@
+<style type="text/css">
+  .attr-copy-btn {
+    display: inline-block;
+    padding: 1px 5px;
+    font-size: 11px;
+    line-height: 1.5;
+    background: transparent;
+    border: 1px solid #d0d0d0;
+    border-radius: 3px;
+    color: #999;
+    cursor: pointer;
+    vertical-align: middle;
+    margin-left: 4px;
+    transition: background .12s, color .12s, border-color .12s;
+  }
+  .attr-copy-btn:hover {
+    background: #f4f4f4;
+    border-color: #aaa;
+    color: #555;
+  }
+  .attr-copy-btn--copied {
+    background: #d4edda !important;
+    border-color: #28a745 !important;
+    color: #28a745 !important;
+  }
+</style>
+
 <script type="text/javascript">
 (function() {
  var orderId = <?= (int)($this->order_id ?? 0);?>;
@@ -378,6 +405,68 @@
    });
  }

+  $(function() {
+    function fallbackCopy(text) {
+      var $tmp = $('<textarea>').css({position: 'fixed', top: 0, left: 0, opacity: 0}).val(text);
+      $('body').append($tmp);
+      $tmp[0].select();
+      try { document.execCommand('copy'); } catch (e) {}
+      $tmp.remove();
+    }
+
+    $('.atributes').each(function() {
+      var $div = $(this);
+      var html = $.trim($div.html());
+      if (!html) { return; }
+
+      var parts = html.split(/<br\s*\/?>/i);
+      var newParts = [];
+
+      for (var i = 0; i < parts.length; i++) {
+        var part = $.trim(parts[i]);
+        if (!part) { continue; }
+
+        var match = part.match(/^(<b>[^<]*<\/b>\s*:\s*)(.+)$/);
+        if (match) {
+          var labelHtml = match[1];
+          var value = $.trim(match[2]);
+          var escapedValue = $('<div>').text(value).html();
+          part = labelHtml + escapedValue
+            + ' <button type="button" class="js-attr-copy-btn attr-copy-btn" data-value="'
+            + escapedValue + '" title="Kopiuj: ' + escapedValue + '">'
+            + '<i class="fa fa-copy"></i></button>';
+        }
+        newParts.push(part);
+      }
+
+      $div.html(newParts.join('<br>'));
+    });
+
+    $(document).on('click', '.js-attr-copy-btn', function() {
+      var $btn = $(this);
+      var value = String($btn.data('value'));
+
+      function showCopied() {
+        $btn.addClass('attr-copy-btn--copied');
+        $btn.find('i').removeClass('fa-copy').addClass('fa-check');
+        setTimeout(function() {
+          $btn.removeClass('attr-copy-btn--copied');
+          $btn.find('i').removeClass('fa-check').addClass('fa-copy');
+        }, 1500);
+      }
+
+      if (navigator.clipboard && navigator.clipboard.writeText) {
+        navigator.clipboard.writeText(value).then(showCopied, function() {
+          fallbackCopy(value);
+          showCopied();
+        });
+      } else {
+        fallbackCopy(value);
+        showCopied();
+      }
+    });
+  });
+
  $('body').on('click', '.btn-toggle-trustmate', function(e) {
    e.preventDefault();

--- a/admin/templates/shop-order/order-details.php
+++ b/admin/templates/shop-order/order-details.php
@@ -3,24 +3,25 @@ $orderId = (int)($this -> order['id'] ?? 0);
 ?>

 <div class="site-title">Szczegóły zamówienia: <?= htmlspecialchars((string)($this -> order['number'] ?? ''), ENT_QUOTES, 'UTF-8');?></div>
+<script>document.title = 'Zamówienie <?= htmlspecialchars((string)($this -> order['number'] ?? ''), ENT_QUOTES, 'UTF-8');?> - shopPro';</script>

-<div class="mb15">
-  <a href="/admin/shop_order/list/" class="btn btn-dark btn-sm mr5">
-    <i class="fa fa-reply"></i> Wstecz
+<div class="od-actions mb15">
+  <a href="/admin/shop_order/list/" class="btn btn-dark btn-sm">
+    <i class="fa fa-reply"></i> <span class="od-actions-label">Wstecz</span>
  </a>
-  <a href="/admin/shop_order/order_edit/order_id=<?= $orderId;?>" class="btn btn-danger btn-sm mr5">
-    <i class="fa fa-pencil"></i> Edytuj zamówienie
+  <a href="/admin/shop_order/order_edit/order_id=<?= $orderId;?>" class="btn btn-danger btn-sm">
+    <i class="fa fa-pencil"></i> <span class="od-actions-label">Edytuj</span>
  </a>

  <? if ( $this -> prev_order_id ):?>
-    <a href="/admin/shop_order/order_details/order_id=<?= (int)$this -> prev_order_id;?>" class="btn btn-success btn-sm mr5">
-      <i class="fa fa-arrow-left"></i> Poprzednie zamówienie
+    <a href="/admin/shop_order/order_details/order_id=<?= (int)$this -> prev_order_id;?>" class="btn btn-success btn-sm">
+      <i class="fa fa-arrow-left"></i> <span class="od-actions-label">Poprzednie</span>
    </a>
  <? endif;?>

  <? if ( $this -> next_order_id ):?>
-    <a href="/admin/shop_order/order_details/order_id=<?= (int)$this -> next_order_id;?>" class="btn btn-success btn-sm mr5">
-      <i class="fa fa-arrow-right"></i> Następne zamówienie
+    <a href="/admin/shop_order/order_details/order_id=<?= (int)$this -> next_order_id;?>" class="btn btn-success btn-sm">
+      <i class="fa fa-arrow-right"></i> <span class="od-actions-label">Następne</span>
    </a>
  <? endif;?>

@@ -89,6 +90,19 @@ $orderId = (int)($this -> order['id'] ?? 0);
            <div>
              <b><?= $this -> order[ 'payment_method' ];?> </b>
            </div>
+            <? if ( !empty($this -> order['apilo_order_id']) ):?>
+              <br/>
+              <div>
+                <i class="fa fa-cloud"></i> Apilo: <b style="color: #27ae60;">tak</b>
+                &mdash; ID: <b id="order-apilo-id"><?= htmlspecialchars((string)$this -> order['apilo_order_id'], ENT_QUOTES, 'UTF-8');?></b>
+                <i class="fa fa-copy" onclick="copyToClipboard( 'order-apilo-id' ); return false;"></i>
+              </div>
+            <? else:?>
+              <br/>
+              <div>
+                <i class="fa fa-cloud"></i> Apilo: <b style="color: #c0392b;">nie</b>
+              </div>
+            <? endif;?>
          </div>
        </div>
        <div class="paid-status panel">
@@ -183,11 +197,15 @@ $orderId = (int)($this -> order['id'] ?? 0);
              <div class="product-message">
                <?= $product[ 'message' ] != '' ? '<strong>Wiadomość:</strong> ' . $product['message'] : '';?>
              </div>
+              <div class="od-mobile-price-line">
+                <? $effective = ((float)$product['price_brutto_promo'] > 0 && (float)$product['price_brutto_promo'] < (float)$product['price_brutto']) ? (float)$product['price_brutto_promo'] : (float)$product['price_brutto'];?>
+                <?= (int)$product['quantity'];?> &times; <?= \Shared\Helpers\Helpers::decimal( $effective );?> = <?= \Shared\Helpers\Helpers::decimal( $effective * $product['quantity'] );?> zł
+              </div>
            </td>
            <td class="tab-center"><?= $product[ 'quantity' ];?></td>
            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto' ] );?> zł</td>
-            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto_promo' ] );?> zł</td>
-            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto_promo' ] * $product[ 'quantity' ] );?> zł</td>
+            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $effective );?> zł</td>
+            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $effective * $product[ 'quantity' ] );?> zł</td>
          </tr>
          <? endforeach; endif;?>
        </tbody>