diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index 1a898a86..c3b55be1 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -15,7 +15,6 @@ if(!empty($EmpCount)) ?> -
@@ -623,12 +622,18 @@ $('#datepick').change(function() {
-
-

Admin Dashboard

-
+ + +
+
+ Sync With Zoho Books +
+
+
+
@@ -644,7 +649,9 @@ $('#datepick').change(function() {
- + + +
@@ -652,13 +659,11 @@ $('#datepick').change(function() {
- -
- + + -
diff --git a/app/Views/sales_dashboard.php b/app/Views/sales_dashboard.php index 4c280fc6..42ca9828 100644 --- a/app/Views/sales_dashboard.php +++ b/app/Views/sales_dashboard.php @@ -98,63 +98,70 @@ +
-
-
-
-
-
-
-

Invoices Table

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Invoice No.Invoice DateInvoice TimeVehicle No.ProductClientQuantityRateValueCGSTSGSTIGSTTCSTotal
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Invoice No.Invoice DateInvoice TimeVehicle No.ProductClientQuantityRateValueCGSTSGSTIGSTTCSTotal
-
-
-
-
+
+
+
+ diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php index 1429b30a..7f2c078b 100644 --- a/app/Views/sales_invoice.php +++ b/app/Views/sales_invoice.php @@ -43,18 +43,20 @@
+
+
+
+

Invoices Table

+ +
+
+
-
-
-
-

Invoices Table

-
-
-
- + +
@@ -72,43 +74,42 @@ - - + item_price * $invoice->item_quantity; - // Calculate CGST and SGST - $cgst_amount = ($subtotal * $invoice->cgst) / 100; - $sgst_amount = ($subtotal * $invoice->sgst) / 100; - $total = $subtotal + $cgst_amount + $sgst_amount;?> - - - - - - - - - - - - - - - - - + $subtotal = $invoice->item_price * $invoice->item_quantity; + // Calculate CGST and SGST + $cgst_amount = ($subtotal * $invoice->cgst) / 100; + $sgst_amount = ($subtotal * $invoice->sgst) / 100; + $total = $subtotal + $cgst_amount + $sgst_amount;?> + + + + + + + + + + + + + + + +
Invoice Date
invoice_date_created)); ?> - invoice_url)){ ?> - - - invoice_number; ?> - invoice_url)){ ?> - - - client_name ?>item_name ?>item_price ?>item_quantity, 2 ,'.', ',' ) ?>status ?>e_invoice_number; ?> - - - -
invoice_date_created)); ?> + invoice_url)){ ?> + + + invoice_number; ?> + invoice_url)){ ?> + + + client_name ?>item_name ?>item_price ?>item_quantity, 2 ,'.', ',' ) ?>status ?>e_invoice_number; ?> + + + +
@@ -122,9 +123,8 @@
- +