Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web

app/Http/Controllers/CustomersController.php

@@ -160,6 +160,7 @@ class CustomersController extends Controller
             if ($verifyEmail) {
                 if ($verifyEmail->id !== $customer->id) {
                     return response()->json([
+                        'success' => false,
                         'error' => 'Email already in use'
                     ]);
                 }

app/Http/Requests/CustomerRequest.php

@@ -36,7 +36,6 @@ class CustomerRequest extends FormRequest
                     'name' => 'required',
                     'addresses.*.address_street_1' => 'max:255',
                     'addresses.*.address_street_2' => 'max:255',
-                    'email' =>  'email|nullable|unique:users,email,'.$this->id
                 ];
                 break;
             default:

resources/assets/js/views/customers/Create.vue

@@ -586,11 +586,16 @@ export default {
         this.isLoading = true
         try {
           let response = await this.updateCustomer(this.formData)
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$t('customers.updated_message'))
             this.$router.push('/admin/customers')
             this.isLoading = false
             return true
+          } else {
+            this.isLoading = false
+            if (response.data.error) {
+              window.toastr['error'](this.$t('validation.email_already_taken'))
+            }
           }
         } catch (err) {
           if (err.response.data.errors.email) {

resources/assets/js/views/payments/Create.vue

@@ -83,7 +83,7 @@
                   :allow-empty="false"
                   :disabled="isEdit"
                   :placeholder="$t('invoices.select_invoice')"
-                  label="invoice_number"
+                  :custom-label="invoiceWithAmount"
                   track-by="invoice_number"
                 />
               </div>
@@ -283,6 +283,9 @@ export default {
       'updatePayment',
       'fetchPayment'
     ]),
+    invoiceWithAmount ({ invoice_number, due_amount }) {
+      return `${invoice_number} (${this.$utils.formatGraphMoney(due_amount, this.customer.currency)})`
+    },
     async loadData () {
       if (this.isEdit) {
         let response = await this.fetchPayment(this.$route.params.id)