Merge branch 'Development' of https://github.com/SmartStay-Hotel/Smar…

…tStay into Development
eduardozo · Jun 18, 2018 · f7a13af · f7a13af
2 parents 29019de + 802e844
commit f7a13af
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/resources/lang/cat/smartstay.php b/resources/lang/cat/smartstay.php
@@ -58,6 +58,7 @@
     'spa.duration' => 'Durada',
     'product.totPrice' => 'Preu total',
     'trips.available' => 'Disponibilitat',
+    'product.select' => 'Selecciona producte',
 
     /*
  restaurant

diff --git a/resources/lang/de/smartstay.php b/resources/lang/de/smartstay.php
@@ -58,6 +58,7 @@
     'spa.duration' => 'Dauer',
     'product.totPrice' => 'Gesamtpreis',
     'trips.available' => 'Verfügbarkeit',
+    'product.select' => 'Produkt auswählen',
 
     /*
 restaurant

diff --git a/resources/lang/en/smartstay.php b/resources/lang/en/smartstay.php
@@ -59,6 +59,7 @@
     'spa.duration' => 'Duration',
     'product.totPrice' => 'Total price',
     'trips.available' => 'Available tickets',
+    'product.select' => 'Choose a product',
 
     /*
 restaurant

diff --git a/resources/lang/it/smartstay.php b/resources/lang/it/smartstay.php
@@ -59,6 +59,7 @@
     'spa.duration' => 'Durata',
     'product.totPrice' => 'Prezzo totale',
     'trips.available' => 'Posti disponibili',
+    'product.select' => 'Seleziona prodotto',
 
     /*
 restaurant

diff --git a/resources/views/guest/dashboard.blade.php b/resources/views/guest/dashboard.blade.php
@@ -211,7 +211,7 @@ class="fas fa-long-arrow-alt-left"></i></button>
                             <button type="submit" v-if="!pedidoHecho" v-on:click="showCancelConfirm=true">{{trans('smartstay.dashboard.cancelOrder')}}</button>
                             <button type="submit" v-if="pedidoHecho" class="bttnPedidoHecho">{{trans('smartstay.dashboard.completedOrder')}}</button>
                         </div>
-                        <confirmcancel v-if="showCancelConfirm" @yes-cancel="deleteOrder(info.service_id,info.id)" @no-cancel="showCancelConfirm=false"></confirmcancel>
+                        <confirmcancel v-if="showCancelConfirm" v-bind:transcancel="['{{trans('smartstay.dashboard.cancelConfirmation')}}', '{{trans('smartstay.dashboard.cancelNo')}}', '{{trans('smartstay.dashboard.cancelYes')}}']" @yes-cancel="deleteOrder(info.service_id,info.id)" @no-cancel="showCancelConfirm=false"></confirmcancel>
                     </div>
 
                 </div>