Browse Source

fix: user order page redir error & missing flatpickr dark mode

M1Screw 2 years ago
parent
commit
037773203a

+ 6 - 6
composer.lock

@@ -123,16 +123,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.283.13",
+            "version": "3.283.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "853eecfb21e8d623fa1b32e597b0a75912e8a404"
+                "reference": "331894cd4751a06a4e5b3e4e2918a9233c9568dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/853eecfb21e8d623fa1b32e597b0a75912e8a404",
-                "reference": "853eecfb21e8d623fa1b32e597b0a75912e8a404",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/331894cd4751a06a4e5b3e4e2918a9233c9568dc",
+                "reference": "331894cd4751a06a4e5b3e4e2918a9233c9568dc",
                 "shasum": ""
             },
             "require": {
@@ -212,9 +212,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.13"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.14"
             },
-            "time": "2023-10-26T18:14:40+00:00"
+            "time": "2023-10-27T18:06:59+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",

+ 3 - 0
resources/views/tabler/admin/coupon.tpl

@@ -1,6 +1,9 @@
 {include file='admin/header.tpl'}
 
 <link rel="stylesheet" href="//{$config['jsdelivr_url']}/npm/flatpickr/dist/flatpickr.min.css">
+{if $user->is_dark_mode}
+    <link rel="stylesheet" href="//{$config['jsdelivr_url']}/npm/flatpickr/dist/themes/dark.min.css">
+{/if}
 <script src="//{$config['jsdelivr_url']}/npm/flatpickr"></script>
 <script src="//{$config['jsdelivr_url']}/npm/flatpickr/dist/l10n/zh.js"></script>
 

+ 1 - 1
resources/views/tabler/user/invoice/view.tpl

@@ -145,7 +145,7 @@
                             $('#success-dialog').modal('show');
                             setTimeout(function () {
                                 $(location).attr('href', '/user/invoice');
-                            }, 1500);
+                            }, {$config['jump_delay']});
                         } else {
                             $('#fail-message').text(data.msg);
                             $('#fail-dialog').modal('show');

+ 1 - 1
resources/views/tabler/user/order/create.tpl

@@ -169,7 +169,7 @@
                         $('#success-dialog').modal('show');
                         setTimeout(function () {
                             $(location).attr('href', '/user/invoice/' + data.invoice_id + '/view');
-                        }, $config['jump_delay']);
+                        }, {$config['jump_delay']});
                     } else {
                         $('#fail-message').text(data.msg);
                         $('#fail-dialog').modal('show');