From 9f5ba32db270fca3c409e583ea73dbf6982ba37f Mon Sep 17 00:00:00 2001 From: Sampanna Rimal Date: Thu, 8 Aug 2024 12:16:46 +0545 Subject: [PATCH] indent testype purchase vat --- account/application/controllers/Welcome.php | 7 + .../controllers/accounts/Accountheads.php | 2 + .../controllers/inventory/Sales.php | 1 + account/application/libraries/BIBAccounts.php | 10 +- .../views/accounts/accountheads/details.php | 48 ++- .../views/accounts/accountheads/edit.php | 283 ++++++++++-------- .../views/accounts/accountheads/list.php | 4 + .../views/inventory/purchases/create.php | 22 +- .../views/inventory/sales/view.php | 21 +- account/pdf/ledgers/ledger_1.wpdf | Bin 17710 -> 17710 bytes account/pdf/ledgers/ledger_19.wpdf | Bin 17705 -> 17707 bytes account/pdf/ledgers/ledger_21.wpdf | Bin 17714 -> 17716 bytes account/pdf/ledgers/ledger_28.wpdf | Bin 17715 -> 17714 bytes account/pdf/ledgers/ledger_29.wpdf | Bin 0 -> 17711 bytes account/pdf/ledgers/ledger_3.wpdf | Bin 17705 -> 17707 bytes account/pdf/ledgers/ledger_32.wpdf | Bin 0 -> 17710 bytes account/pdf/ledgers/ledger_8.wpdf | Bin 17715 -> 17706 bytes 17 files changed, 255 insertions(+), 143 deletions(-) create mode 100644 account/pdf/ledgers/ledger_29.wpdf create mode 100644 account/pdf/ledgers/ledger_32.wpdf diff --git a/account/application/controllers/Welcome.php b/account/application/controllers/Welcome.php index 9490757..9824f58 100644 --- a/account/application/controllers/Welcome.php +++ b/account/application/controllers/Welcome.php @@ -234,5 +234,12 @@ class Welcome extends CI_Controller if ($query->num_rows() == 0) { $this->db->query("ALTER TABLE tbl_sales ADD COLUMN vatToggle INT(11)"); } + + $query = $this->db->query("SHOW COLUMNS FROM tbl_accounts LIKE 'account_bank'"); + + // If the column doesn't exist, alter the table to add it + if ($query->num_rows() == 0) { + $this->db->query("ALTER TABLE tbl_accounts ADD COLUMN account_bank VARCHAR(50)"); + } } } diff --git a/account/application/controllers/accounts/Accountheads.php b/account/application/controllers/accounts/Accountheads.php index 6a876d9..ccb5e99 100644 --- a/account/application/controllers/accounts/Accountheads.php +++ b/account/application/controllers/accounts/Accountheads.php @@ -26,6 +26,7 @@ class Accountheads extends CI_Controller // 'account_partyname' => filter_var($_POST['account_partyname']), 'account_number' => filter_var($_POST['account_number']), 'account_branch' => filter_var($_POST['account_branch']), + 'account_bank' => filter_var($_POST['account_bank']), 'account_partyaddress' => filter_var($_POST['account_partyaddress']), 'account_partypan' => filter_var($_POST['account_partypan']), 'account_partycontact' => filter_var($_POST['account_partycontact']), @@ -88,6 +89,7 @@ class Accountheads extends CI_Controller 'account_currency' => filter_var($_POST['account_currency']), 'account_number' => filter_var($_POST['account_number']), 'account_branch' => filter_var($_POST['account_branch']), + 'account_bank' => filter_var($_POST['account_bank']), 'account_partyname' => filter_var($_POST['account_partyname']), 'account_partyaddress' => filter_var($_POST['account_partyaddress']), 'account_partypan' => filter_var($_POST['account_partypan']), diff --git a/account/application/controllers/inventory/Sales.php b/account/application/controllers/inventory/Sales.php index 8bea4c6..ee682a6 100644 --- a/account/application/controllers/inventory/Sales.php +++ b/account/application/controllers/inventory/Sales.php @@ -32,6 +32,7 @@ class Sales extends CI_Controller 'accounts_id' => filter_var($_POST['accounts_id']), 'sales_date' => filter_var($_POST['salesDate']), 'discount' => filter_var($_POST['discountpercentage']), + 'vatToggle' => filter_var($_POST['vatToggleValue']), 'created_on' => date('Y-m-d H:i:s'), 'created_by' => 'admin', 'remarks' => '', diff --git a/account/application/libraries/BIBAccounts.php b/account/application/libraries/BIBAccounts.php index 6b00ba4..c7d695a 100644 --- a/account/application/libraries/BIBAccounts.php +++ b/account/application/libraries/BIBAccounts.php @@ -608,10 +608,16 @@ class bibaccounts - + isZero == true) continue; ?> - accategory_name; ?> + + parent_category_id): ?> + accategory_name; ?> + + accategory_name; ?> + + posting_side == 'DR') ? $accountCategory->opening_balance : 0); ?> posting_side == 'CR') ? $accountCategory->opening_balance : 0); ?> diff --git a/account/application/views/accounts/accountheads/details.php b/account/application/views/accounts/accountheads/details.php index 9f45e85..0f4d1ee 100644 --- a/account/application/views/accounts/accountheads/details.php +++ b/account/application/views/accounts/accountheads/details.php @@ -63,17 +63,25 @@ User profile picture -
+ -
+ + + + accategory_id) == "Bank Account"): ?> +
+
+ +
@@ -89,36 +97,53 @@
+ - + + + accategory_id);?> + +
-
+ -
+
-
+
-
+
+ + + +
+ + + +
@@ -126,8 +151,6 @@
-
-
@@ -143,12 +166,13 @@
+
- +
diff --git a/account/application/views/accounts/accountheads/edit.php b/account/application/views/accounts/accountheads/edit.php index c9ba690..3af678c 100644 --- a/account/application/views/accounts/accountheads/edit.php +++ b/account/application/views/accounts/accountheads/edit.php @@ -1,5 +1,5 @@
- +
@@ -15,154 +15,174 @@
- +
-
- -
-
- - +
+ +
+
+ + +
+
-
-
- +
- + accategory_id, "", false, "status=1"); ?>
- + - + - +
- -
" name="opening_balance">
+ +
" name="opening_balance">
- +
- Account Image + Account Image
-
- -
-
- + + accategory_id); + ?> + +
+ + + +
+ + +
+ +
+
-
- - - -
-
- + + +
+ + +
+ +
+
-
-
-
- + + + +
+ + +
+ +
+
+ +
- -
-
- -
-
- -
-
- - - -
-
- -
- -
- -
-
- -
- - -
- -
- -
- - - -
- - -
- -
- -
- -
- -
- -
- - -
- -
- -
- - - -
- - -
- -
- -
- -
+
@@ -181,7 +201,7 @@

- +

@@ -193,12 +213,39 @@
+ + \ No newline at end of file diff --git a/account/application/views/accounts/accountheads/list.php b/account/application/views/accounts/accountheads/list.php index f1ae225..3021093 100644 --- a/account/application/views/accounts/accountheads/list.php +++ b/account/application/views/accounts/accountheads/list.php @@ -71,6 +71,10 @@