From 1e04a8d0a590acb1356a09d47e38ac70c130d649 Mon Sep 17 00:00:00 2001
From: hastichavda <hasiichavda10@gmail.com>
Date: Thu, 14 Nov 2019 16:28:09 +0530
Subject: [PATCH 1/2] add media query in modals and pc in item units

---
 .../components/base/modal/CategoryModal.vue   |  2 +-
 .../components/base/modal/CustomerModal.vue   | 40 +++++++++----------
 .../js/components/base/modal/ItemModal.vue    | 11 ++---
 resources/assets/js/plugins/en.js             |  4 --
 resources/assets/js/plugins/es.js             |  8 +++-
 resources/assets/js/plugins/fr.js             |  8 +++-
 resources/assets/js/views/items/Create.vue    |  3 +-
 resources/assets/js/views/items/Index.vue     |  3 +-
 .../sass/components/category-modal.scss       | 16 ++++++++
 .../sass/components/customer-modal.scss       | 17 ++++++++
 .../assets/sass/components/item-modal.scss    | 17 ++++++++
 11 files changed, 95 insertions(+), 34 deletions(-)

diff --git a/resources/assets/js/components/base/modal/CategoryModal.vue b/resources/assets/js/components/base/modal/CategoryModal.vue
index 81863ac8..609e1d85 100644
--- a/resources/assets/js/components/base/modal/CategoryModal.vue
+++ b/resources/assets/js/components/base/modal/CategoryModal.vue
@@ -3,7 +3,7 @@
     <form action="" @submit.prevent="submitCategoryData">
       <div class="card-body">
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">{{ $t('expenses.category') }}<span class="required text-danger">*</span></label>
+          <label class="col-sm-4 col-form-label input-label">{{ $t('expenses.category') }}<span class="required text-danger">*</span></label>
           <div class="col-sm-7">
             <base-input
               ref="name"
diff --git a/resources/assets/js/components/base/modal/CustomerModal.vue b/resources/assets/js/components/base/modal/CustomerModal.vue
index 5c27bfcf..dc2a03eb 100644
--- a/resources/assets/js/components/base/modal/CustomerModal.vue
+++ b/resources/assets/js/components/base/modal/CustomerModal.vue
@@ -7,7 +7,7 @@
           <tab id="basic-home" :name="$t('customers.basic_info')">
             <div class="basic-info">
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.display_name') }} <span class="required">*</span></label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.display_name') }} <span class="required">*</span></label>
                 <div class="col-sm-7">
                   <base-input
                     ref="name"
@@ -25,7 +25,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.primary_display_name') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.primary_display_name') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="formData.contact_name"
@@ -34,7 +34,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('login.email') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('login.email') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     :invalid="$v.formData.email.$error"
@@ -49,7 +49,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $tc('settings.currencies.currency') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $tc('settings.currencies.currency') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="currency"
@@ -64,7 +64,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     :invalid="$v.formData.phone.$error"
@@ -79,7 +79,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.website') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.website') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="formData.website"
@@ -100,7 +100,7 @@
           <tab id="basic-profile" :name="$t('customers.billing_address')">
             <div class="basic-info">
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.name') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.name') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="billing.name"
@@ -110,7 +110,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     :invalid="$v.billing.phone.$error"
@@ -126,7 +126,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.address') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.address') }}</label>
                 <div class="col-sm-7">
                   <base-text-area
                     v-model="billing.address_street_1"
@@ -155,7 +155,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.country') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.country') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="billingCountry"
@@ -171,7 +171,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.state') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.state') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="billingState"
@@ -187,7 +187,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.city') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.city') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="billingCity"
@@ -213,7 +213,7 @@
               </div> -->
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.zip_code') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.zip_code') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="billing.zip"
@@ -236,7 +236,7 @@
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.name') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.name') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="shipping.name"
@@ -246,7 +246,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.phone') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.phone') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     :invalid="$v.shipping.phone.$error"
@@ -262,7 +262,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.address') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.address') }}</label>
                 <div class="col-sm-7">
                   <base-text-area
                     v-model="shipping.address_street_1"
@@ -291,7 +291,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.country') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.country') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="shippingCountry"
@@ -307,7 +307,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.state') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.state') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="shippingState"
@@ -323,7 +323,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.city') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.city') }}</label>
                 <div class="col-sm-7">
                   <base-select
                     v-model="shippingCity"
@@ -339,7 +339,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ $t('customers.zip_code') }}</label>
+                <label class="col-sm-4 col-form-label input-label">{{ $t('customers.zip_code') }}</label>
                 <div class="col-sm-7">
                   <base-input
                     v-model="shipping.zip"
diff --git a/resources/assets/js/components/base/modal/ItemModal.vue b/resources/assets/js/components/base/modal/ItemModal.vue
index 17809aef..58c7f09e 100644
--- a/resources/assets/js/components/base/modal/ItemModal.vue
+++ b/resources/assets/js/components/base/modal/ItemModal.vue
@@ -3,7 +3,7 @@
     <form action="" @submit.prevent="submitItemData">
       <div class="card-body">
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">
+          <label class="col-sm-4 col-form-label input-label">
             {{ $t('items.name') }}<span class="required">*</span>
           </label>
           <div class="col-sm-7">
@@ -22,7 +22,7 @@
           </div>
         </div>
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">{{ $t('items.price') }}<span class="required">*</span></label>
+          <label class="col-sm-4 col-form-label input-label">{{ $t('items.price') }}<span class="required">*</span></label>
           <div class="col-sm-7">
             <div class="base-input">
               <money
@@ -41,7 +41,7 @@
           </div>
         </div>
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">{{ $t('items.unit') }}</label>
+          <label class="col-sm-4 col-form-label input-label">{{ $t('items.unit') }}</label>
           <div class="col-sm-7">
             <base-select
               v-model="formData.unit"
@@ -54,7 +54,7 @@
         </div>
 
         <div class="form-group row">
-          <label class="col-sm-4 col-form-label">{{ $t('items.description') }}</label>
+          <label class="col-sm-4 col-form-label input-label">{{ $t('items.description') }}</label>
           <div class="col-sm-7">
             <base-text-area
               v-model="formData.description"
@@ -121,7 +121,8 @@ export default {
         { name: 'kg', value: 'kg' },
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
-        { name: 'mg', value: 'mg' }
+        { name: 'mg', value: 'mg' },
+        { name: 'pc', value: 'pc ' }
       ],
       formData: {
         name: null,
diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index 404bebda..2ad510fb 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -611,8 +611,6 @@ export default {
       estimate_viewed_desc: 'When your customer views the estimate sent via crater dashboard.',
       save: 'Save',
       email_save_message: 'Email saved successfully',
-      // invoice_viewed_message: 'Invoice viewed updated successfully',
-      // estimate_viewed_message: 'Estimate viewed updated successfully',
       please_enter_email: 'Please Enter Email'
     },
     tax_types: {
@@ -622,7 +620,6 @@ export default {
       add_new_tax: 'Add New Tax',
       tax_settings: 'Tax Settings',
       tax_per_item: 'Tax Per Item',
-      // tax_per_item_switch: 'Tax Per Item updated successfully',
       tax_name: 'Tax Name',
       compound_tax: 'Compound Tax',
       percent: 'Percent',
@@ -660,7 +657,6 @@ export default {
       preference: 'Preference | Preferences',
       general_settings: 'Default preferences for the system.',
       updated_message: 'Preferences updated successfully',
-      // set_discount_per_item_message: 'Discount set per item updated successfully',
       select_language: 'select language',
       select_time_zone: 'select Time Zone',
       select_date_formate: 'select Date Formate',
diff --git a/resources/assets/js/plugins/es.js b/resources/assets/js/plugins/es.js
index 73454af7..69ca6255 100644
--- a/resources/assets/js/plugins/es.js
+++ b/resources/assets/js/plugins/es.js
@@ -529,7 +529,8 @@ export default {
       preferences: 'Preferencias',
       notifications: 'Notificaciones',
       tax_types: 'Tipos de impuestos',
-      expense_category: 'Categorías de gastos'
+      expense_category: 'Categorías de gastos',
+      update_app: 'Actualizar aplicación'
     },
     title: 'Configuraciones',
     setting: 'Configuraciones | Configuraciones',
@@ -661,6 +662,11 @@ export default {
       select_time_zone: 'selecciona la zona horaria',
       select_date_formate: 'seleccione formato de fecha',
       select_financial_year: 'seleccione año financiero'
+    },
+    update_app: {
+      title: 'Actualizar aplicación',
+      description: 'actualizar la descripción de la aplicación',
+      update: 'Actualizar'
     }
   },
   wizard: {
diff --git a/resources/assets/js/plugins/fr.js b/resources/assets/js/plugins/fr.js
index 27d9c312..e55cc8fd 100644
--- a/resources/assets/js/plugins/fr.js
+++ b/resources/assets/js/plugins/fr.js
@@ -529,7 +529,8 @@ export default {
       preferences: 'Préférences',
       notifications: 'Les notifications',
       tax_types: 'Types de taxe',
-      expense_category: 'Catégories de dépenses'
+      expense_category: 'Catégories de dépenses',
+      update_app: "Mise à jour de l'application"
     },
     title: 'Paramètres',
     setting: 'Paramètres | Paramètres',
@@ -664,6 +665,11 @@ export default {
       select_time_zone: 'sélectionnez le fuseau horaire',
       select_date_formate: 'sélectionnez Date Formate',
       select_financial_year: 'sélectionner lexercice'
+    },
+    update_app: {
+      title: "Mise à jour de l'application",
+      description: "mettre à jour la description de l'application",
+      update: 'Mise à jour'
     }
   },
   wizard: {
diff --git a/resources/assets/js/views/items/Create.vue b/resources/assets/js/views/items/Create.vue
index 5d00a5b5..277a2f15 100644
--- a/resources/assets/js/views/items/Create.vue
+++ b/resources/assets/js/views/items/Create.vue
@@ -112,7 +112,8 @@ export default {
         { name: 'kg', value: 'kg' },
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
-        { name: 'mg', value: 'mg' }
+        { name: 'mg', value: 'mg' },
+        { name: 'pc', value: 'pc ' }
       ],
       formData: {
         name: '',
diff --git a/resources/assets/js/views/items/Index.vue b/resources/assets/js/views/items/Index.vue
index c2370607..f9471a48 100644
--- a/resources/assets/js/views/items/Index.vue
+++ b/resources/assets/js/views/items/Index.vue
@@ -245,7 +245,8 @@ export default {
         { name: 'kg', value: 'kg' },
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
-        { name: 'mg', value: 'mg' }
+        { name: 'mg', value: 'mg' },
+        { name: 'pc', value: 'pc ' }
       ],
       isRequestOngoing: true,
       filtersApplied: false,
diff --git a/resources/assets/sass/components/category-modal.scss b/resources/assets/sass/components/category-modal.scss
index 2719c7e5..47aed933 100644
--- a/resources/assets/sass/components/category-modal.scss
+++ b/resources/assets/sass/components/category-modal.scss
@@ -19,3 +19,19 @@
     }
 
 }
+
+@media(max-width: $x-small-breakpoint ) {
+
+    .base-modal {
+
+        .category-modal {
+
+            .input-label {
+                text-align: left;
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/sass/components/customer-modal.scss b/resources/assets/sass/components/customer-modal.scss
index c7ecc271..76568b9a 100644
--- a/resources/assets/sass/components/customer-modal.scss
+++ b/resources/assets/sass/components/customer-modal.scss
@@ -34,3 +34,20 @@
     }
 
 }
+
+
+@media(max-width: $x-small-breakpoint ) {
+
+    .base-modal {
+
+        .customer-modal {
+
+            .input-label {
+                text-align: left;
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/sass/components/item-modal.scss b/resources/assets/sass/components/item-modal.scss
index 97b4c304..2bb210dc 100644
--- a/resources/assets/sass/components/item-modal.scss
+++ b/resources/assets/sass/components/item-modal.scss
@@ -19,3 +19,20 @@
     }
 
 }
+
+
+@media(max-width: $x-small-breakpoint ) {
+
+    .base-modal {
+
+        .item-modal {
+
+            .input-label {
+                text-align: left;
+            }
+
+        }
+
+    }
+
+}
\ No newline at end of file

From a1bfd2f73883aeb50ffa1ecd4e87372d130b0078 Mon Sep 17 00:00:00 2001
From: hastichavda <hasiichavda10@gmail.com>
Date: Thu, 14 Nov 2019 17:27:30 +0530
Subject: [PATCH 2/2] fix the change

---
 resources/assets/js/components/base/modal/ItemModal.vue | 2 +-
 resources/assets/js/views/dashboard/Dashboard.vue       | 4 ++--
 resources/assets/js/views/items/Create.vue              | 2 +-
 resources/assets/js/views/items/Index.vue               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/components/base/modal/ItemModal.vue b/resources/assets/js/components/base/modal/ItemModal.vue
index 58c7f09e..439f55bd 100644
--- a/resources/assets/js/components/base/modal/ItemModal.vue
+++ b/resources/assets/js/components/base/modal/ItemModal.vue
@@ -122,7 +122,7 @@ export default {
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
         { name: 'mg', value: 'mg' },
-        { name: 'pc', value: 'pc ' }
+        { name: 'pc', value: 'pc' }
       ],
       formData: {
         name: null,
diff --git a/resources/assets/js/views/dashboard/Dashboard.vue b/resources/assets/js/views/dashboard/Dashboard.vue
index bca6d07b..59c1798b 100644
--- a/resources/assets/js/views/dashboard/Dashboard.vue
+++ b/resources/assets/js/views/dashboard/Dashboard.vue
@@ -168,7 +168,7 @@
           >
             <table-column :label="$t('dashboard.recent_invoices_card.due_on')" show="formattedDueDate" />
             <table-column :label="$t('dashboard.recent_invoices_card.customer')" show="user.name" />
-            <table-column :label="$t('dashboard.recent_invoices_card.amount_due')" sort-as="due_amount">
+            <table-column :label="$t('dashboard.recent_invoices_card.amount_due')" show="due_amount" sort-as="due_amount">
               <template slot-scope="row">
                 <span>{{ $t('dashboard.recent_invoices_card.amount_due') }}</span>
                 <div v-html="$utils.formatMoney(row.due_amount, row.user.currency)"/>
@@ -242,7 +242,7 @@
           >
             <table-column :label="$t('dashboard.recent_estimate_card.date')" show="formattedExpiryDate" />
             <table-column :label="$t('dashboard.recent_estimate_card.customer')" show="user.name" />
-            <table-column :label="$t('dashboard.recent_estimate_card.amount_due')" sort-as="total">
+            <table-column :label="$t('dashboard.recent_estimate_card.amount_due')" show="total" sort-as="total">
               <template slot-scope="row">
                 <span>{{ $t('dashboard.recent_estimate_card.amount_due') }}</span>
                 <div v-html="$utils.formatMoney(row.total, row.user.currency)"/>
diff --git a/resources/assets/js/views/items/Create.vue b/resources/assets/js/views/items/Create.vue
index 277a2f15..31e96798 100644
--- a/resources/assets/js/views/items/Create.vue
+++ b/resources/assets/js/views/items/Create.vue
@@ -113,7 +113,7 @@ export default {
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
         { name: 'mg', value: 'mg' },
-        { name: 'pc', value: 'pc ' }
+        { name: 'pc', value: 'pc' }
       ],
       formData: {
         name: '',
diff --git a/resources/assets/js/views/items/Index.vue b/resources/assets/js/views/items/Index.vue
index f9471a48..2d9e2ea2 100644
--- a/resources/assets/js/views/items/Index.vue
+++ b/resources/assets/js/views/items/Index.vue
@@ -246,7 +246,7 @@ export default {
         { name: 'km', value: 'km' },
         { name: 'lb', value: 'lb' },
         { name: 'mg', value: 'mg' },
-        { name: 'pc', value: 'pc ' }
+        { name: 'pc', value: 'pc' }
       ],
       isRequestOngoing: true,
       filtersApplied: false,