Merge branch 'build-version300' into 'master'

Build version300 See merge request mohit.panjvani/crater-web!162
crater-invoice-inc · Jan 27, 2020 · 06a538b · 06a538b
2 parents 824d2e3 + 7ab0419
commit 06a538b
Show file tree

Hide file tree

Showing 35 changed files with 121 additions and 124 deletions.
diff --git a/.env.example b/.env.example
@@ -9,7 +9,7 @@ DB_HOST=db
 DB_PORT=3306
 DB_DATABASE=crater
 DB_USERNAME=crater
-DB_PASSWORD=crater
+DB_PASSWORD="crater"
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
@@ -36,7 +36,8 @@ public function index(Request $request)
         $start = Carbon::now();
         $end = Carbon::now();
         $terms = explode('-', $fiscalYear);
-        if ($terms[0] < $start->month) {
+
+        if ($terms[0] <= $start->month) {
             $startDate->month($terms[0])->startOfMonth();
             $start->month($terms[0])->startOfMonth();
             $end->month($terms[0])->endOfMonth();
@@ -93,6 +94,7 @@ public function index(Request $request)
         }
 
         $start->subMonth()->endOfMonth();
+
         $salesTotal = Invoice::whereCompany($request->header('company'))
             ->whereBetween(
                 'invoice_date',

diff --git a/app/Http/Controllers/EstimatesController.php b/app/Http/Controllers/EstimatesController.php
@@ -168,24 +168,20 @@ public function store(EstimatesRequest $request)
             $data['user'] = User::find($userId)->toArray();
             $data['company'] = Company::find($estimate->company_id);
             $email = $data['user']['email'];
-            $notificationEmail = CompanySetting::getSetting(
-                'notification_email',
-                $request->header('company')
-            );
 
             if (!$email) {
                 return response()->json([
                     'error' => 'user_email_does_not_exist'
                 ]);
             }
 
-            if (!$notificationEmail) {
+            if (!config('mail.from.name')) {
                 return response()->json([
-                    'error' => 'notification_email_does_not_exist'
+                    'error' => 'from_email_does_not_exist'
                 ]);
             }
 
-            \Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
+            \Mail::to($email)->send(new EstimatePdf($data));
         }
 
         $estimate = Estimate::with([
@@ -340,24 +336,20 @@ public function sendEstimate(Request $request)
         $data['company'] = Company::find($estimate->company_id);
 
         $email = $data['user']['email'];
-        $notificationEmail = CompanySetting::getSetting(
-            'notification_email',
-            $request->header('company')
-        );
 
         if (!$email) {
             return response()->json([
                 'error' => 'user_email_does_not_exist'
             ]);
         }
 
-        if (!$notificationEmail) {
+        if (!config('mail.from.name')) {
             return response()->json([
-                'error' => 'notification_email_does_not_exist'
+                'error' => 'from_email_does_not_exist'
             ]);
         }
 
-        \Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
+        \Mail::to($email)->send(new EstimatePdf($data));
 
         if ($estimate->status == Estimate::STATUS_DRAFT) {
             $estimate->status = Estimate::STATUS_SENT;

diff --git a/app/Http/Controllers/InvoicesController.php b/app/Http/Controllers/InvoicesController.php
@@ -167,11 +167,6 @@ public function store(Requests\InvoicesRequest $request)
             $data['user'] = User::find($request->user_id)->toArray();
             $data['company'] = Company::find($invoice->company_id);
 
-            $notificationEmail = CompanySetting::getSetting(
-                'notification_email',
-                $request->header('company')
-            );
-
             $email = $data['user']['email'];
 
             if (!$email) {
@@ -180,13 +175,13 @@ public function store(Requests\InvoicesRequest $request)
                 ]);
             }
 
-            if (!$notificationEmail) {
+            if (!config('mail.from.name')) {
                 return response()->json([
-                    'error' => 'notification_email_does_not_exist'
+                    'error' => 'from_email_does_not_exist'
                 ]);
             }
 
-            \Mail::to($email)->send(new invoicePdf($data, $notificationEmail));
+            \Mail::to($email)->send(new invoicePdf($data));
         }
 
         $invoice = Invoice::with(['items', 'user', 'invoiceTemplate', 'taxes'])->find($invoice->id);
@@ -408,24 +403,20 @@ public function sendInvoice(Request $request)
         $data['user'] = User::find($userId)->toArray();
         $data['company'] = Company::find($invoice->company_id);
         $email = $data['user']['email'];
-        $notificationEmail = CompanySetting::getSetting(
-            'notification_email',
-            $request->header('company')
-        );
 
         if (!$email) {
             return response()->json([
                 'error' => 'user_email_does_not_exist'
             ]);
         }
 
-        if (!$notificationEmail) {
+        if (!config('mail.from.name')) {
             return response()->json([
-                'error' => 'notification_email_does_not_exist'
+                'error' => 'from_email_does_not_exist'
             ]);
         }
 
-        \Mail::to($email)->send(new invoicePdf($data, $notificationEmail));
+        \Mail::to($email)->send(new invoicePdf($data));
 
         if ($invoice->status == Invoice::STATUS_DRAFT) {
             $invoice->status = Invoice::STATUS_SENT;

diff --git a/app/Mail/EstimatePdf.php b/app/Mail/EstimatePdf.php
@@ -12,17 +12,14 @@ class EstimatePdf extends Mailable
 
     public $data = [];
 
-    public $notificationEmail = '';
-
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($data, $notificationEmail)
+    public function __construct($data)
     {
         $this->data = $data;
-        $this->notificationEmail = $notificationEmail;
     }
 
     /**
@@ -32,6 +29,6 @@ public function __construct($data, $notificationEmail)
      */
     public function build()
     {
-        return $this->from($this->notificationEmail)->markdown('emails.send.estimate', ['data', $this->data]);
+        return $this->markdown('emails.send.estimate', ['data', $this->data]);
     }
 }
diff --git a/app/Mail/invoicePdf.php b/app/Mail/invoicePdf.php
@@ -12,17 +12,14 @@ class invoicePdf extends Mailable
 
     public $data = [];
 
-    public $notificationEmail = '';
-
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($data, $notificationEmail)
+    public function __construct($data)
     {
         $this->data = $data;
-        $this->notificationEmail = $notificationEmail;
     }
 
     /**
@@ -32,6 +29,6 @@ public function __construct($data, $notificationEmail)
      */
     public function build()
     {
-        return $this->from($this->notificationEmail)->markdown('emails.send.invoice', ['data', $this->data]);
+        return $this->markdown('emails.send.invoice', ['data', $this->data]);
     }
 }
diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
@@ -38,15 +38,15 @@ public function saveDatabaseVariables(DatabaseEnvironmentRequest $request)
             'DB_PORT='.config('database.connections.'.config('database.default').'.port')."\n".
             'DB_DATABASE='.config('database.connections.'.config('database.default').'.database')."\n".
             'DB_USERNAME='.config('database.connections.'.config('database.default').'.username')."\n".
-            'DB_PASSWORD='.config('database.connections.'.config('database.default').'.password')."\n\n";
+            'DB_PASSWORD="'.config('database.connections.'.config('database.default').'.password')."\"\n\n";
 
         $newDatabaseData =
             'DB_CONNECTION='.$request->database_connection."\n".
             'DB_HOST='.$request->database_hostname."\n".
             'DB_PORT='.$request->database_port."\n".
             'DB_DATABASE='.$request->database_name."\n".
             'DB_USERNAME='.$request->database_username."\n".
-            'DB_PASSWORD='.$request->database_password."\n\n";
+            'DB_PASSWORD="'.$request->database_password."\"\n\n";
 
         try {
 

diff --git a/public/assets/css/crater.css b/public/assets/css/crater.css
diff --git a/public/assets/js/app.js b/public/assets/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/assets/js/app.js": "/assets/js/app.js?id=173ae96baaa64386fe81",
-    "/assets/css/crater.css": "/assets/css/crater.css?id=52eb9b3d184487e7c842"
+    "/assets/js/app.js": "/assets/js/app.js?id=397e57d36ef22a2e14fc",
+    "/assets/css/crater.css": "/assets/css/crater.css?id=616996a79c1df69d18de"
 }
diff --git a/resources/assets/js/plugins/ar.json b/resources/assets/js/plugins/ar.json
@@ -398,6 +398,7 @@
     "update_payment": "تحديث الدفعة",
     "payment": "دفعة | مدفوعات",
     "no_payments": "لا يوجد مدفوعات حتى الآن!",
+    "no_matching_payments": "لا توجد مدفوعات مطابقة!",
     "list_of_payments": "سوف تحتوي هذه القائمة على مدفوعات الفواتير.",
     "select_payment_mode": "اختر طريقة الدفع",
 

diff --git a/resources/assets/js/plugins/de.json b/resources/assets/js/plugins/de.json
@@ -452,6 +452,7 @@
     "list_of_payments": "Dieser Abschnitt enthält die Liste der Zahlungen.",
     "new_payment": "Neue Zahlung",
     "no_payments": "Keine Zahlungen vorhanden!",
+    "no_matching_payments": "Es gibt keine passenden Zahlungen!",
     "note": "Hinweis",
     "payment": "Zahlung | Zahlungen",
     "payment_mode": "Zahlungsart",

diff --git a/resources/assets/js/plugins/en.json b/resources/assets/js/plugins/en.json
@@ -409,6 +409,7 @@
     "update_payment": "Update Payment",
     "payment": "Payment | Payments",
     "no_payments": "No payments yet!",
+    "no_matching_payments": "There are no matching payments!",
     "list_of_payments": "This section will contain the list of payments.",
     "select_payment_mode": "Select payment mode",
     "confirm_send_payment": "This payment will be sent via email to the customer",

diff --git a/resources/assets/js/plugins/es.json b/resources/assets/js/plugins/es.json
@@ -397,6 +397,7 @@
     "update_payment": "Actualizar pago",
     "payment": "Pago | Pagos",
     "no_payments": "¡Aún no hay pagos!",
+    "no_matching_payments": "¡No hay pagos equivalentes!",
     "list_of_payments": "Esta sección contendrá la lista de pagos.",
     "select_payment_mode": "Seleccionar modo de pago",
 

diff --git a/resources/assets/js/plugins/fr.json b/resources/assets/js/plugins/fr.json
@@ -395,6 +395,7 @@
     "update_payment": "Mettre à jour le paiement",
     "payment": "Paiement | Paiements",
     "no_payments": "Aucun paiement pour le moment!",
+    "no_matching_payments": "Il n'y a aucun paiement correspondant!",
     "list_of_payments": "Cette section contiendra la liste des paiements",
     "select_payment_mode": "Sélectionnez le mode de paiement",
 

diff --git a/resources/assets/js/plugins/pt-br.json b/resources/assets/js/plugins/pt-br.json
@@ -398,6 +398,7 @@
     "update_payment": "Atualizar Pagamento",
     "payment": "Pagamento | Pagamentos",
     "no_payments": "Ainda sem pagamentos!",
+    "no_matching_payments": "Não há pagamentos correspondentes!",
     "list_of_payments": "Esta seção conterá a lista de pagamentos.",
     "select_payment_mode": "Selecione a forma de pagamento",
 

diff --git a/resources/assets/js/store/modules/dashboard/actions.js b/resources/assets/js/store/modules/dashboard/actions.js
@@ -13,13 +13,13 @@ export const loadData = ({ commit, dispatch, state }, params) => {
   })
 }
 
-export const getChart = ({ commit, dispatch, state }) => {
-  return new Promise((resolve, reject) => {
-    window.axios.get(`/api/dashboard/expense/chart`).then((response) => {
-      commit(types.SET_INITIAL_DATA, response.data)
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
+// export const getChart = ({ commit, dispatch, state }) => {
+//   return new Promise((resolve, reject) => {
+//     window.axios.get(`/api/dashboard/expense/chart`).then((response) => {
+//       commit(types.SET_INITIAL_DATA, response.data)
+//       resolve(response)
+//     }).catch((err) => {
+//       reject(err)
+//     })
+//   })
+// }
diff --git a/resources/assets/js/store/modules/item/actions.js b/resources/assets/js/store/modules/item/actions.js
@@ -136,7 +136,9 @@ export const fatchItemUnit = ({ commit, dispatch, state }, id) => {
 export const deleteItemUnit = ({ commit, dispatch, state }, id) => {
   return new Promise((resolve, reject) => {
     window.axios.delete(`/api/units/${id}`).then((response) => {
-      commit(types.DELETE_ITEM_UNIT, id)
+      if (!response.data.error) {
+        commit(types.DELETE_ITEM_UNIT, id)
+      }
       resolve(response)
     }).catch((err) => {
       reject(err)

diff --git a/resources/assets/js/store/modules/payment/actions.js b/resources/assets/js/store/modules/payment/actions.js
@@ -154,7 +154,9 @@ export const fetchPaymentMode = ({ commit, dispatch, state }, data) => {
 export const deletePaymentMode = ({ commit, dispatch, state }, id) => {
   return new Promise((resolve, reject) => {
     window.axios.delete(`/api/payment-methods/${id}`).then((response) => {
-      commit(types.DELETE_PAYMENT_MODE, id)
+      if (!response.data.error) {
+        commit(types.DELETE_PAYMENT_MODE, id)
+      }
       resolve(response)
     }).catch((err) => {
       reject(err)