Refactor app.js and theme.php to set default country code on telephon…

…e country code picker Signed-off-by: Sam <[email protected]>
tastyigniter · Jun 2, 2023 · df44259 · df44259
1 parent 71638ec
commit df44259
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 40 deletions.
diff --git a/.github/workflows/compile-assets.yml b/.github/workflows/compile-assets.yml
diff --git a/assets/css/app.css b/assets/css/app.css
diff --git a/assets/js/app.js b/assets/js/app.js
diff --git a/assets/src/js/app.js b/assets/src/js/app.js
@@ -29,7 +29,7 @@ $.fn.tabs = function () {
 /*
  * Ensure the CSRF token is added to all AJAX requests.
  */
-$.ajaxPrefilter(function(options) {
+$.ajaxPrefilter(function (options) {
     var token = $('meta[name="csrf-token"]').attr('content')
 
     if (token) {
@@ -73,15 +73,15 @@ $(function () {
 
         if (days) {
             var date = new Date()
-            date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000))
-            expires = '; expires=' + date.toGMTString()
+            date.setTime(date.getTime()+(days * 24 * 60 * 60 * 1000))
+            expires = '; expires='+date.toGMTString()
         }
 
-        document.cookie = name + "=" + value + expires + "; path=/"
+        document.cookie = name+"="+value+expires+"; path=/"
     }
 
     function checkCookie(name) {
-        var nameEQ = name + "=",
+        var nameEQ = name+"=",
             ca = document.cookie.split(';')
 
         for (var i = 0; i < ca.length; i++) {
@@ -123,7 +123,7 @@ $(function () {
     $(document).find('[data-control="country-code-picker"]').each(function () {
         var $this = $(this),
             options = $.extend({
-                initialCountry: 'gb',
+                initialCountry: (app.country.iso_code_2 || '').toLowerCase(),
                 separateDialCode: true,
                 utilsScript: "https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/11.0.4/js/utils.js"
             }, $this.data()),

diff --git a/theme.php b/theme.php
@@ -1,8 +1,15 @@
 <?php
 
-// add currency helper
+$defaultCountry = \System\Models\Countries_model::getDefault();
 $defaultCurrency = app('currency')->getDefault();
 Assets::putJsVars([
+    'country' => [
+        'name' => $defaultCountry->country_name,
+        'iso_code_2' => $defaultCountry->iso_code_2,
+        'iso_code_3' => $defaultCountry->iso_code_3,
+        'format' => $defaultCountry->format,
+    ],
+    // add currency helper
     'currency' => [
         'symbol' => $defaultCurrency->currency_symbol,
         'symbol_position' => $defaultCurrency->symbol_position,