From d4f1428d5fcca1d5e4c1cc9182cc0d732b8c9ce8 Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Tue, 5 May 2020 20:03:51 +0530 Subject: [PATCH 1/8] refactor sales customers pdf template --- .../app/pdf/reports/sales-customers.blade.php | 99 +++++-------------- 1 file changed, 22 insertions(+), 77 deletions(-) diff --git a/resources/views/app/pdf/reports/sales-customers.blade.php b/resources/views/app/pdf/reports/sales-customers.blade.php index d91337e6..fae52bac 100644 --- a/resources/views/app/pdf/reports/sales-customers.blade.php +++ b/resources/views/app/pdf/reports/sales-customers.blade.php @@ -8,15 +8,6 @@ font-family: "DejaVu Sans"; } - /* html { - margin: 0px; - padding: 0px; - } */ - - table { - border-collapse: collapse; - } - .main-container { /* padding: 30px 80px; */ } @@ -29,8 +20,11 @@ width: 100%; } + table { + border-collapse: collapse; + } + .heading-text { - font-style: normal; font-weight: 600; font-size: 24px; color: #5851D8; @@ -41,7 +35,6 @@ } .heading-date-range { - font-style: normal; font-weight: 600; font-size: 15px; color: #A5ACC1; @@ -52,7 +45,6 @@ } .sub-heading-text { - font-style: normal; font-weight: 600; font-size: 16px; line-height: 21px; @@ -62,90 +54,55 @@ margin-top: 30px; } - .income-table { - margin-top: 53px; - width: 100%; - } - - .income-title { - padding: 0px; - margin: 0px; - font-style: normal; - font-weight: normal; - font-size: 16px; - line-height: 21px; - color: #040405; - text-align: left; - } - - .income-money { - padding: 0px; - margin: 0px; - font-style: normal; - font-weight: 500; - font-size: 16px; - line-height: 21px; - text-align: right; - color: #040405; - text-align: right; - } - - .expenses-title { + .sales-cusutomer-name { margin-top: 20px; padding-left: 3px; - font-style: normal; - font-weight: normal; font-size: 16px; line-height: 21px; color: #040405; } - .expenses-table-container { + .sales-table-container { padding-left: 10px; } - .expenses-table { + .sales-table { width: 100%; padding-bottom: 10px; } - .expense-title { + .sales-information-text { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; color: #595959; } - .expense-money { + .sales-money { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; text-align: right; color: #595959; } - .expense-total-table { + .sales-total-indicator-table { border-top: 1px solid #EAF1FB; width: 100%; } - .expense-total-cell { + .sales-total-container { padding-top: 10px; } - .expense-total { + .sales-total-text { padding-top: 10px; padding-right: 30px; padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 16px; line-height: 21px; @@ -153,7 +110,7 @@ color: #040405; } - .profit-table { + .profit-indicator-table { width: 100%; margin-top: 40px; padding: 15px 20px; @@ -165,7 +122,6 @@ padding: 0px; margin: 0px; text-align: left; - font-style: normal; font-weight: 600; font-size: 16px; line-height: 21px; @@ -176,7 +132,6 @@ padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 20px; line-height: 21px; @@ -206,29 +161,19 @@ - {{-- - - - - -
-

Income

- 		-

{{ $income }}

-
--}} @foreach ($customers as $customer) -

{{ $customer->name }}

-
- +

{{ $customer->name }}

+
+
@foreach ($customer->invoices as $invoice) @@ -236,10 +181,10 @@ @endforeach
-

+

{{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }})

-

+

{!! format_money_pdf($invoice->total) !!}

- +
- @@ -249,7 +194,7 @@ -
-

+

+

{!! format_money_pdf($customer->totalAmount) !!}

+
diff --git a/resources/views/app/pdf/reports/sales-items.blade.php b/resources/views/app/pdf/reports/sales-items.blade.php index e939a57c..c4b1759c 100644 --- a/resources/views/app/pdf/reports/sales-items.blade.php +++ b/resources/views/app/pdf/reports/sales-items.blade.php @@ -13,10 +13,6 @@ padding: 0px; } */ - table { - border-collapse: collapse; - } - .main-container { /* padding: 30px 80px; */ } @@ -24,13 +20,16 @@ .sub-container{ padding: 0px 20px; } + + table { + border-collapse: collapse; + } .header { width: 100%; } .heading-text { - font-style: normal; font-weight: 600; font-size: 24px; color: #5851D8; @@ -41,7 +40,6 @@ } .heading-date-range { - font-style: normal; font-weight: 600; font-size: 15px; color: #A5ACC1; @@ -52,7 +50,6 @@ } .sub-heading-text { - font-style: normal; font-weight: 600; font-size: 16px; line-height: 21px; @@ -62,90 +59,55 @@ margin-top: 30px; } - .income-table { - margin-top: 53px; - width: 100%; - } - - .income-title { - padding: 0px; - margin: 0px; - font-style: normal; - font-weight: normal; - font-size: 16px; - line-height: 21px; - color: #040405; - text-align: left; - } - - .income-money { - padding: 0px; - margin: 0px; - font-style: normal; - font-weight: 500; - font-size: 16px; - line-height: 21px; - text-align: right; - color: #040405; - text-align: right; - } - - .expenses-title { + .sales-items-title { margin-top: 20px; padding-left: 3px; - font-style: normal; - font-weight: normal; font-size: 16px; line-height: 21px; color: #040405; } - .expenses-table-container { + .items-table-container { padding-left: 10px; } - .expenses-table { + .items-table { width: 100%; padding-bottom: 10px; } - .expense-title { + .item-title { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; color: #595959; } - .expense-money { + .item-sales-amount { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; text-align: right; color: #595959; } - .expense-total-table { + .sales-total-indicator-table { border-top: 1px solid #EAF1FB; width: 100%; } - .expense-total-cell { + .sales-total-cell { padding-top: 10px; } - .expense-total { + .sales-total-amount { padding-top: 10px; padding-right: 30px; padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 16px; line-height: 21px; @@ -153,7 +115,7 @@ color: #040405; } - .profit-table { + .profit-indicator-table { width: 100%; margin-top: 40px; padding: 15px 20px; @@ -165,18 +127,16 @@ padding: 0px; margin: 0px; text-align: left; - font-style: normal; font-weight: 600; font-size: 16px; line-height: 21px; color: #595959; } - .profit-money { + .profit-amount { padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 20px; line-height: 21px; @@ -205,29 +165,19 @@

TOTAL SALES

From 2fd66bf748764aa3b148590155f25b9a55048ef6 Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Tue, 5 May 2020 20:49:51 +0530 Subject: [PATCH 2/8] refactor sales items and customer pdfs --- .../app/pdf/reports/sales-customers.blade.php | 4 +- .../app/pdf/reports/sales-items.blade.php | 100 +++++------------- 2 files changed, 27 insertions(+), 77 deletions(-) diff --git a/resources/views/app/pdf/reports/sales-customers.blade.php b/resources/views/app/pdf/reports/sales-customers.blade.php index fae52bac..d9a6c4dd 100644 --- a/resources/views/app/pdf/reports/sales-customers.blade.php +++ b/resources/views/app/pdf/reports/sales-customers.blade.php @@ -128,7 +128,7 @@ color: #595959; } - .profit-money { + .profit-amount { padding: 0px; margin: 0px; text-align: right; @@ -200,7 +200,7 @@

TOTAL SALES

 -

+

{!! format_money_pdf($totalAmount) !!}

- - {{-- - - - - -
-

Income

- 		-

{{ $income }}

-
--}} -

Items

+ +

Items

@foreach ($items as $item) -
- +
+
@@ -236,10 +186,10 @@ @endforeach -
-

+

{{ $item->name }}

-

+

{!! format_money_pdf($item->total_amount) !!}

+
- @@ -248,13 +198,13 @@ -
-

+

+

{!! format_money_pdf($totalAmount) !!}

+
From 39556892cd5081ff7e1b5956817143a5b22414ac Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Tue, 5 May 2020 20:58:20 +0530 Subject: [PATCH 3/8] refactor sales customers --- resources/views/app/pdf/reports/sales-customers.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/app/pdf/reports/sales-customers.blade.php b/resources/views/app/pdf/reports/sales-customers.blade.php index d9a6c4dd..8b2e0459 100644 --- a/resources/views/app/pdf/reports/sales-customers.blade.php +++ b/resources/views/app/pdf/reports/sales-customers.blade.php @@ -79,7 +79,7 @@ color: #595959; } - .sales-money { + .sales-amount { padding: 0px; margin: 0px; font-size: 14px; @@ -97,7 +97,7 @@ padding-top: 10px; } - .sales-total-text { + .sales-total-amount { padding-top: 10px; padding-right: 30px; padding: 0px; @@ -173,7 +173,7 @@

@@ -184,7 +184,7 @@

TOTAL SALES

 -

+

{!! format_money_pdf($totalAmount) !!}

-

+

{!! format_money_pdf($invoice->total) !!}

From f8913531b6be338815e32e323246bef4f90ae145 Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Wed, 6 May 2020 18:09:28 +0530 Subject: [PATCH 4/8] refactor profit loss pdfs --- .../app/pdf/reports/profit-loss.blade.php | 44 ++++++------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/resources/views/app/pdf/reports/profit-loss.blade.php b/resources/views/app/pdf/reports/profit-loss.blade.php index fbcb59c7..4434fb38 100644 --- a/resources/views/app/pdf/reports/profit-loss.blade.php +++ b/resources/views/app/pdf/reports/profit-loss.blade.php @@ -13,10 +13,6 @@ padding: 0px; } - table { - border-collapse: collapse; - } - .main-container { padding: 30px 60px; } @@ -25,12 +21,15 @@ padding: 0px 20px; } + table { + border-collapse: collapse; + } + .header { width: 100%; } .heading-text { - font-style: normal; font-weight: 600; font-size: 24px; color: #5851D8; @@ -41,7 +40,6 @@ } .heading-date-range { - font-style: normal; font-weight: 600; font-size: 15px; color: #A5ACC1; @@ -52,10 +50,8 @@ } .sub-heading-text { - font-style: normal; font-weight: 600; font-size: 16px; - /* line-height: 21px; */ color: #595959; padding: 0px; margin: 0px; @@ -70,18 +66,15 @@ .income-title { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 16px; line-height: 21px; color: #040405; text-align: left; } - .income-money { + .income-amount { padding: 0px; margin: 0px; - font-style: normal; font-weight: 500; font-size: 16px; line-height: 21px; @@ -93,8 +86,6 @@ .expenses-title { margin-top: 20px; padding-left: 3px; - font-style: normal; - font-weight: normal; font-size: 16px; line-height: 21px; color: #040405; @@ -112,25 +103,21 @@ .expense-title { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; color: #595959; } - .expense-money { + .expense-amount { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; text-align: right; color: #595959; } - .expense-total-table { + .expense-total-indicator-table { border-top: 1px solid #EAF1FB; width: 100%; } @@ -146,7 +133,6 @@ padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 16px; line-height: 21px; @@ -154,7 +140,7 @@ color: #040405; } - .profit-table { + .profit-indicator-table { width: 100%; margin-top: 40px; padding: 15px 20px; @@ -166,18 +152,16 @@ padding: 0px; margin: 0px; text-align: left; - font-style: normal; font-weight: 600; font-size: 16px; line-height: 21px; color: #595959; } - .profit-money { + .profit-amount { padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 20px; line-height: 21px; @@ -210,7 +194,7 @@

Income

-

+

{!! format_money_pdf($customer->totalAmount) !!}

-

{!! format_money_pdf($income) !!}

+

{!! format_money_pdf($income) !!}
@@ -225,7 +209,7 @@

-

+

{!! format_money_pdf($expenseCategory->total_amount) !!}

@@ -236,20 +220,20 @@
- +

{!! format_money_pdf($totalExpense) !!}
- +

NET PROFIT

 -

{!! format_money_pdf(($income-$totalExpense)) !!}

+

{!! format_money_pdf(($income-$totalExpense)) !!}
From c68fce19f930b471765a2cd22355ecb6179b39be Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Wed, 6 May 2020 19:02:02 +0530 Subject: [PATCH 5/8] refactor expenses pdf --- .../views/app/pdf/reports/expenses.blade.php | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/resources/views/app/pdf/reports/expenses.blade.php b/resources/views/app/pdf/reports/expenses.blade.php index 054bd79f..2db27627 100644 --- a/resources/views/app/pdf/reports/expenses.blade.php +++ b/resources/views/app/pdf/reports/expenses.blade.php @@ -13,10 +13,6 @@ padding: 0px; } */ - table { - border-collapse: collapse; - } - .main-container { /* padding: 30px 60px; */ } @@ -25,12 +21,15 @@ padding: 0px 20px; } + table { + border-collapse: collapse; + } + .header { width: 100%; } .heading-text { - font-style: normal; font-weight: 600; font-size: 24px; color: #5851D8; @@ -41,7 +40,6 @@ } .heading-date-range { - font-style: normal; font-weight: 600; font-size: 15px; color: #A5ACC1; @@ -52,10 +50,8 @@ } .sub-heading-text { - font-style: normal; font-weight: 600; font-size: 16px; - /* line-height: 21px; */ color: #595959; padding: 0px; margin: 0px; @@ -65,8 +61,6 @@ .expenses-title { margin-top: 60px; padding-left: 3px; - font-style: normal; - font-weight: normal; font-size: 16px; line-height: 21px; color: #040405; @@ -84,18 +78,14 @@ .expense-title { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; color: #595959; } - .expense-money { + .expense-amount { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; text-align: right; @@ -118,7 +108,6 @@ padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 16px; line-height: 21px; @@ -126,7 +115,7 @@ color: #040405; } - .total-expense-table { + .expenses-total-indicator-table { width: 100%; margin-top: 40px; padding: 15px 20px; @@ -138,18 +127,16 @@ padding: 0px; margin: 0px; text-align: left; - font-style: normal; font-weight: 600; font-size: 16px; line-height: 21px; color: #595959; } - .total-expense-money { + .total-expense-amount { padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 20px; line-height: 21px; @@ -186,7 +173,7 @@

-

+

{!! format_money_pdf($expenseCategory->total_amount) !!}

@@ -203,13 +190,13 @@ - +

TOTAL EXPENSE

 -

{!! format_money_pdf($totalExpense) !!}

+

{!! format_money_pdf($totalExpense) !!}
From c497b906dff63b1473644480ec3664fb5279d74d Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Wed, 6 May 2020 20:32:10 +0530 Subject: [PATCH 6/8] refactor taxt report pdf --- .../app/pdf/reports/tax-summary.blade.php | 48 +++++-------------- 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/resources/views/app/pdf/reports/tax-summary.blade.php b/resources/views/app/pdf/reports/tax-summary.blade.php index 33931627..f96c692c 100644 --- a/resources/views/app/pdf/reports/tax-summary.blade.php +++ b/resources/views/app/pdf/reports/tax-summary.blade.php @@ -13,25 +13,23 @@ padding: 0px; } */ - table { - border-collapse: collapse; - } - .main-container { - /* padding: 30px 60px; */ } .sub-container{ padding: 0px 20px; } + table { + border-collapse: collapse; + } + .header { width: 100%; margin-bottom: 60px } .heading-text { - font-style: normal; font-weight: 600; font-size: 24px; color: #5851D8; @@ -42,7 +40,6 @@ } .heading-date-range { - font-style: normal; font-weight: 600; font-size: 15px; color: #A5ACC1; @@ -53,31 +50,17 @@ } .sub-heading-text { - font-style: normal; font-weight: 600; font-size: 16px; - /* line-height: 21px; */ color: #595959; padding: 0px; margin: 0px; margin-top: 6px; } - .types-title { + .tax-types-title { margin-top: 20px; padding-left: 3px; - font-style: normal; - font-weight: normal; - font-size: 16px; - line-height: 21px; - color: #040405; - } - - .tax-title { - margin-top: 60px; - padding-left: 3px; - font-style: normal; - font-weight: normal; font-size: 16px; line-height: 21px; color: #040405; @@ -95,18 +78,14 @@ .tax-title { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; color: #595959; } - .tax-money { + .tax-amount { padding: 0px; margin: 0px; - font-style: normal; - font-weight: normal; font-size: 14px; line-height: 21px; text-align: right; @@ -129,7 +108,6 @@ padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 16px; line-height: 21px; @@ -137,7 +115,7 @@ color: #040405; } - .total-tax-table { + .total-tax-indicator-table { width: 100%; margin-top: 40px; padding: 15px 20px; @@ -149,18 +127,16 @@ padding: 0px; margin: 0px; text-align: left; - font-style: normal; font-weight: 600; font-size: 16px; line-height: 21px; color: #595959; } - .total-tax-money { + .total-tax-amount { padding: 0px; margin: 0px; text-align: right; - font-style: normal; font-weight: 500; font-size: 20px; line-height: 21px; @@ -190,7 +166,7 @@ -

Tax Types

+

Tax Types

@foreach ($taxTypes as $tax) @@ -201,7 +177,7 @@

@@ -221,13 +197,13 @@
-

+

{!! format_money_pdf($tax->total_tax_amount) !!}

- +
From 611ffafec56f301d9ddb1bf0d7192ba6fe5cd941 Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Wed, 6 May 2020 20:41:15 +0530 Subject: [PATCH 7/8] refactor sales customers pdf --- resources/views/app/pdf/reports/sales-customers.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/app/pdf/reports/sales-customers.blade.php b/resources/views/app/pdf/reports/sales-customers.blade.php index 8b2e0459..1dd7e899 100644 --- a/resources/views/app/pdf/reports/sales-customers.blade.php +++ b/resources/views/app/pdf/reports/sales-customers.blade.php @@ -93,7 +93,7 @@ width: 100%; } - .sales-total-container { + .sales-total-cell { padding-top: 10px; } @@ -183,7 +183,7 @@

TOTAL TAX

 -

+

{!! format_money_pdf($totalTaxAmount) !!}

-
+

{!! format_money_pdf($customer->totalAmount) !!}

From fc1a7c7438c5cfd0c96843b43224aa0af030164e Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Thu, 7 May 2020 18:59:50 +0530 Subject: [PATCH 8/8] refactor reports pdfs --- .../views/app/pdf/reports/expenses.blade.php | 130 +++++++-------- .../app/pdf/reports/profit-loss.blade.php | 152 ++++++++---------- .../app/pdf/reports/sales-customers.blade.php | 131 +++++++-------- .../app/pdf/reports/sales-items.blade.php | 136 +++++++--------- .../app/pdf/reports/tax-summary.blade.php | 147 ++++++++--------- 5 files changed, 321 insertions(+), 375 deletions(-) diff --git a/resources/views/app/pdf/reports/expenses.blade.php b/resources/views/app/pdf/reports/expenses.blade.php index 2db27627..716c4fac 100644 --- a/resources/views/app/pdf/reports/expenses.blade.php +++ b/resources/views/app/pdf/reports/expenses.blade.php @@ -2,30 +2,20 @@ Expenses Report - {{-- --}} -
-
- - - - - - - - +
+
-

{{ $company->name }}

- 		-

{{ $from_date }} - {{ $to_date }}

-
-

EXPENSES REPORT

-
+ + + + + + + +
+

{{ $company->name }}

+ 		+

{{ $from_date }} - {{ $to_date }}

+
+

EXPENSES REPORT

+
+

Expenses

+
+ + @foreach ($expenseCategories as $expenseCategory) + + + + + @endforeach
+

+ {{ $expenseCategory->category->name }} +

+ 		+

+ {!! format_money_pdf($expenseCategory->total_amount) !!} +

+
-

Expenses

-
- - @foreach ($expenseCategories as $expenseCategory) - - - - - @endforeach -
-

- {{ $expenseCategory->category->name }} -

- 		-

- {!! format_money_pdf($expenseCategory->total_amount) !!} -

-
-
- - - - - -
-

{!! format_money_pdf($totalExpense) !!}

-
- - - - - -
-

TOTAL EXPENSE

- 		-

{!! format_money_pdf($totalExpense) !!}

-
+ + + + + +
+

{!! format_money_pdf($totalExpense) !!}

+
+ + + + + +
+

TOTAL EXPENSE

+ 		+

{!! format_money_pdf($totalExpense) !!}

+
diff --git a/resources/views/app/pdf/reports/profit-loss.blade.php b/resources/views/app/pdf/reports/profit-loss.blade.php index 4434fb38..2d751d6b 100644 --- a/resources/views/app/pdf/reports/profit-loss.blade.php +++ b/resources/views/app/pdf/reports/profit-loss.blade.php @@ -2,30 +2,20 @@ Profit & Loss Report - {{-- --}} -
-
- - - - - - - - -
-

{{ $company->name }}

- 		-

{{ $from_date }} - {{ $to_date }}

-
-

PROFIT & LOSS REPORT

-
+
+ + + + + + + + +
+

{{ $company->name }}

+ 		+

{{ $from_date }} - {{ $to_date }}

+
+

PROFIT & LOSS REPORT

+
- - - - - -
-

Income

- 		-

{!! format_money_pdf($income) !!}

-
-

Expenses

-
- - @foreach ($expenseCategories as $expenseCategory) - - - - - @endforeach +
-

- {{ $expenseCategory->category->name }} -

- 		-

- {!! format_money_pdf($expenseCategory->total_amount) !!} -

-
+ + + + +
+

Income

+ 		+

{!! format_money_pdf($income) !!}

+
+

Expenses

+
+ + @foreach ($expenseCategories as $expenseCategory) + + + + + @endforeach -
+

+ {{ $expenseCategory->category->name }} +

+ 		+

+ {!! format_money_pdf($expenseCategory->total_amount) !!} +

+
-
+
- - - - - -
-

{!! format_money_pdf($totalExpense) !!}

-
- - - - - -
-

NET PROFIT

- 		-

{!! format_money_pdf(($income-$totalExpense)) !!}

-
+ + + + + +
+

{!! format_money_pdf($totalExpense) !!}

+
+ + + + + +
+

NET PROFIT

+ 		+

{!! format_money_pdf(($income-$totalExpense)) !!}

+
diff --git a/resources/views/app/pdf/reports/sales-customers.blade.php b/resources/views/app/pdf/reports/sales-customers.blade.php index 1dd7e899..67bb1b60 100644 --- a/resources/views/app/pdf/reports/sales-customers.blade.php +++ b/resources/views/app/pdf/reports/sales-customers.blade.php @@ -2,28 +2,23 @@ Sales Customer Report - {{-- --}} -
-
- - - - - - - - -
-

{{ $company->name }}

- 		-

{{ $from_date }} - {{ $to_date }}

-
-

Sales Report: By Customer

-
- - @foreach ($customers as $customer) -

{{ $customer->name }}

-
- - @foreach ($customer->invoices as $invoice) - - - - - @endforeach -
-

- {{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }}) -

- 		-

- {!! format_money_pdf($invoice->total) !!} -

-
-
- - - - -
-

- {!! format_money_pdf($customer->totalAmount) !!} -

-
- @endforeach -
- - - +
+
+ + +
-

TOTAL SALES

+

{{ $company->name }}

 -

- {!! format_money_pdf($totalAmount) !!} -

+

{{ $from_date }} - {{ $to_date }}

+
+

Sales Report: By Customer
+ + @foreach ($customers as $customer) +

{{ $customer->name }}

+
+ + @foreach ($customer->invoices as $invoice) + + + + + @endforeach +
+

+ {{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }}) +

+ 		+

+ {!! format_money_pdf($invoice->total) !!} +

+
+
+ + + + +
+

+ {!! format_money_pdf($customer->totalAmount) !!} +

+
+ @endforeach
+ + + + + + + +
+

TOTAL SALES

+ 		+

+ {!! format_money_pdf($totalAmount) !!} +

+
diff --git a/resources/views/app/pdf/reports/sales-items.blade.php b/resources/views/app/pdf/reports/sales-items.blade.php index c4b1759c..1e814180 100644 --- a/resources/views/app/pdf/reports/sales-items.blade.php +++ b/resources/views/app/pdf/reports/sales-items.blade.php @@ -2,30 +2,20 @@ Sales Item Report - {{-- --}} -
-
- - - - - - - - -
-

{{ $company->name }}

- 		-

{{ $from_date }} - {{ $to_date }}

-
-

Sales Report: By Item

-
- -

Items

- @foreach ($items as $item) -
- - - - - -
-

- {{ $item->name }} -

- 		-

- {!! format_money_pdf($item->total_amount) !!} -

-
-
- @endforeach - - +
+
+ + + + + + + +
+

{{ $company->name }}

+ 		+

{{ $from_date }} - {{ $to_date }}

+
+

Sales Report: By Item

+
+ +

Items

+ @foreach ($items as $item) +
+ - +
-

- {!! format_money_pdf($totalAmount) !!} +

+

+ {{ $item->name }} +

+ 		+

+ {!! format_money_pdf($item->total_amount) !!}

-
+
+ @endforeach - - - - - - -
-

TOTAL SALES

- 		-

- {!! format_money_pdf($totalAmount) !!} -

-
+ + + + +
+

+ {!! format_money_pdf($totalAmount) !!} +

+
+ + + + + + + +
+

TOTAL SALES

+ 		+

+ {!! format_money_pdf($totalAmount) !!} +

+
diff --git a/resources/views/app/pdf/reports/tax-summary.blade.php b/resources/views/app/pdf/reports/tax-summary.blade.php index f96c692c..d0849725 100644 --- a/resources/views/app/pdf/reports/tax-summary.blade.php +++ b/resources/views/app/pdf/reports/tax-summary.blade.php @@ -2,29 +2,20 @@ Tax Summary Report - {{-- --}} -
-
- - - - - - - - +
+
-

- {{ $company->name }} -

- 		-

- {{ $from_date }} - {{ $to_date }} -

-
-

TAX REPORT

-
+ + + + + + + +
+

+ {{ $company->name }} +

+ 		+

+ {{ $from_date }} - {{ $to_date }} +

+
+

TAX REPORT

+
+

Tax Types

+
+ + @foreach ($taxTypes as $tax) + + + + + @endforeach +
+

+ {{ $tax->taxType->name }} +

+ 		+

+ {!! format_money_pdf($tax->total_tax_amount) !!} +

+
-

Tax Types

-
- - @foreach ($taxTypes as $tax) - - - - - @endforeach - -
-

- {{ $tax->taxType->name }} -

- 		-

- {!! format_money_pdf($tax->total_tax_amount) !!} -

-
-
- - - - - -
-

- {!! format_money_pdf($totalTaxAmount) !!} -

-
- - - - - -
-

TOTAL TAX

- 		-

- {!! format_money_pdf($totalTaxAmount) !!} -

-
+ + + + + +
+

+ {!! format_money_pdf($totalTaxAmount) !!} +

+
+ + + + + +
+

TOTAL TAX

+ 		+

+ {!! format_money_pdf($totalTaxAmount) !!} +

+