wip #3080 @1

diff --git a/app/Models/Settings.php b/app/Models/Settings.php
index ea3cf125519c9c69c5cff846c7f3ad6ab0f6326c..be8f0bbdd9281c24cbc026f23ab73493090d63b5 100644 (file)
--- a/app/Models/Settings.php
+++ b/app/Models/Settings.php
@@ -18,7 +18,7 @@ class Settings extends \Cubist\Backpack\app\Magic\Models\Settings
         $this->addField(['name' => 'phone',
             'type' => 'Text',
             'label' => 'Téléphone',
-            'translatable' => false,
+            'translatable' => true,
             'tab' => 'Informations de contact']);
 
         $this->addField(['name' => 'address',

diff --git a/app/Templates/Catalog.php b/app/Templates/Catalog.php
index 5fab9fc3c1778408de6a5398bdc30995875a5659..044e237f52ce334c48730c2a9b09a86140acaace 100644 (file)
--- a/app/Templates/Catalog.php
+++ b/app/Templates/Catalog.php
@@ -24,7 +24,7 @@ class Catalog extends TemplateAbstract
         Debugbar::startMeasure('nav_catalog', 'Make Products sub navigation');
         parent::setMenuChildren($menu);
 
-        $families = ['captor' =>'Capteurs', 'system' => 'Systèmes de mesure'];
+        $families = ['captor' => __('Capteurs'), 'system' => __('Systèmes de mesure')];
 
         Debugbar::startMeasure('nav_catalog_models', 'Request catalog models');
         Debugbar::startMeasure('nav_catalog_models_types', 'Request catalog models (types)');

diff --git a/resources/views/components/phone-link.blade.php b/resources/views/components/phone-link.blade.php
index 63ea8546ae0f2f256051d1097cf072979b330326..520e37e5e6e1bdb0d38cda91928d312df859a64c 100644 (file)
--- a/resources/views/components/phone-link.blade.php
+++ b/resources/views/components/phone-link.blade.php
@@ -5,9 +5,13 @@
 
     @php
         $number = preg_replace('/\D/', '', $number); // Strip everything except digits
+        $number=preg_replace('/^00/','+',$number);
+
 
         // When a country code is present, add this to the start of the link and trim leading zero
-        if (isset($countryCode)) {
+        if(strpos($number,'+')===0){
+
+        }elseif (isset($countryCode)) {
             $number = "+{$countryCode}" . ltrim($number, 0);
         }
     @endphp

diff --git a/resources/views/partials/contact-details.blade.php b/resources/views/partials/contact-details.blade.php
index e9e0bed1c9e89d452ba7f499d08a753ddd891972..36d67a411e5e3ea32131dd8a551103e503fbd7d2 100644 (file)
--- a/resources/views/partials/contact-details.blade.php
+++ b/resources/views/partials/contact-details.blade.php
@@ -2,24 +2,24 @@
     @svg('icon-address', 'contact-details-icon')
     <div class="contact-details-text">
         <div class="contact-details-title">{{ __('Adresse') }}</div>
-        {!! nl2br($global->address) !!}
+        {!! nl2br($global->get('address')) !!}
     </div>
 </map-link>
 
 <a data-ga="event" data-ga-category="contact" data-ga-action="click"
-   data-ga-label="email" class="contact-details-block" href="mailto:{{ $global->email }}">
+   data-ga-label="email" class="contact-details-block" href="mailto:{{ $global->get('email') }}">
     @svg('icon-email', 'contact-details-icon')
     <div class="contact-details-text">
         <div class="contact-details-title">{{ __('Email') }}</div>
-        {{ $global->email }}
+        {{ $global->get('email') }}
     </div>
 </a>
 
-<phone-link class="contact-details-block" :number="$global->phone" country-code="33">
+<phone-link class="contact-details-block" :number="$global->get('phone')" country-code="33">
     @svg('icon-phone', 'contact-details-icon')
     <div class="contact-details-text">
         <div class="contact-details-title">{{ __('Téléphone') }}</div>
-        {{ $global->phone }}
+        {{ $global->get('phone') }}
     </div>
 </phone-link>