diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index 534b064..aed1f8e 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -739,8 +739,8 @@ class Admin_controller extends BaseController $output = '
'; foreach ($creditsData as $row) { if($row['is_active'] == 1 ){ $status = 'Success';}else{ $status = 'Failed';} - - $output .=''; + $cost_with_tax = number_format($row['cost_with_tax'], 2, '.', ''); + $output .=''; } echo $output .= '
Order IdPackage NameCostTotal AmountCreditsPayment Status
'.$row['order_id'].''.$row['package_name'].''.$row['cost'].''.$row['cost_with_tax'].''.$row['credit_points'].''.$status.'
'.$row['order_id'].''.$row['package_name'].''.$row['cost'].''.$cost_with_tax.''.$row['credit_points'].''.$status.'
'; diff --git a/app/Controllers/PaymentController.php b/app/Controllers/PaymentController.php index ad06b80..1a16f1f 100644 --- a/app/Controllers/PaymentController.php +++ b/app/Controllers/PaymentController.php @@ -235,7 +235,7 @@ class PaymentController extends BaseController $credits_data['order_id'] = $orderId; - $credits_data['cost_with_tax'] = round( ( $packageData[0]['cost'] + (($packageData[0]['cost'] * ($gst + $pst) ) / 100) ) , 2 ); + $credits_data['cost_with_tax'] = ( $packageData[0]['cost'] + (($packageData[0]['cost'] * ($gst + $pst) ) / 100) ); diff --git a/app/Views/credits_pack_list.php b/app/Views/credits_pack_list.php index 047d2e8..8bf2fb6 100644 --- a/app/Views/credits_pack_list.php +++ b/app/Views/credits_pack_list.php @@ -51,7 +51,7 @@ - + diff --git a/app/Views/members_list.php b/app/Views/members_list.php index 532b006..e308e4f 100644 --- a/app/Views/members_list.php +++ b/app/Views/members_list.php @@ -77,7 +77,7 @@ { ?> - + diff --git a/app/Views/success_mail.php b/app/Views/success_mail.php index e67d744..08699da 100644 --- a/app/Views/success_mail.php +++ b/app/Views/success_mail.php @@ -73,7 +73,7 @@
Credits
- $ + $ diff --git a/app/Views/transactions_list.php b/app/Views/transactions_list.php index 5381e0f..b197167 100644 --- a/app/Views/transactions_list.php +++ b/app/Views/transactions_list.php @@ -66,7 +66,8 @@ format('M d , Y'); ?> diff --git a/composer.lock b/composer.lock index 7a4cdea..d37b7b7 100644 --- a/composer.lock +++ b/composer.lock @@ -260,16 +260,16 @@ }, { "name": "daycry/cronjob", - "version": "V2.2.11", + "version": "V2.2.12", "source": { "type": "git", "url": "https://github.com/daycry/cronjob.git", - "reference": "77ff2ee1c401cbb7a0cf0a6d1abaa1d33b31b76c" + "reference": "b66311d2ed32434548ef5cde917e6a48398c1c72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/daycry/cronjob/zipball/77ff2ee1c401cbb7a0cf0a6d1abaa1d33b31b76c", - "reference": "77ff2ee1c401cbb7a0cf0a6d1abaa1d33b31b76c", + "url": "https://api.github.com/repos/daycry/cronjob/zipball/b66311d2ed32434548ef5cde917e6a48398c1c72", + "reference": "b66311d2ed32434548ef5cde917e6a48398c1c72", "shasum": "" }, "require": { @@ -302,9 +302,9 @@ "homepage": "https://github.com/daycry/cronjob", "support": { "issues": "https://github.com/daycry/cronjob/issues", - "source": "https://github.com/daycry/cronjob/tree/V2.2.11" + "source": "https://github.com/daycry/cronjob/tree/V2.2.12" }, - "time": "2023-05-18T22:29:05+00:00" + "time": "2023-07-14T09:51:59+00:00" }, { "name": "dragonmantank/cron-expression", @@ -369,16 +369,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.8.0", + "version": "v6.8.1", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "48b0210c51718d682e53210c24d25c5a10a2299b" + "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/48b0210c51718d682e53210c24d25c5a10a2299b", - "reference": "48b0210c51718d682e53210c24d25c5a10a2299b", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5dbc8959427416b8ee09a100d7a8588c00fb2e26", + "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26", "shasum": "" }, "require": { @@ -426,9 +426,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.8.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.8.1" }, - "time": "2023-06-20T16:45:35+00:00" + "time": "2023-07-14T18:33:00+00:00" }, { "name": "google/apiclient", @@ -501,16 +501,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.307.0", + "version": "v0.309.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "5f7d451aa912355dda61aa29ac3a4afa8b252467" + "reference": "562f8e5ddbca68d52afc3bf47d03839e78722026" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/5f7d451aa912355dda61aa29ac3a4afa8b252467", - "reference": "5f7d451aa912355dda61aa29ac3a4afa8b252467", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/562f8e5ddbca68d52afc3bf47d03839e78722026", + "reference": "562f8e5ddbca68d52afc3bf47d03839e78722026", "shasum": "" }, "require": { @@ -539,9 +539,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.307.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.309.0" }, - "time": "2023-07-01T01:02:13+00:00" + "time": "2023-07-16T01:08:14+00:00" }, { "name": "google/auth", @@ -1209,16 +1209,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.20", + "version": "3.0.21", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67" + "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67", - "reference": "543a1da81111a0bfd6ae7bbc2865c5e89ed3fc67", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4580645d3fc05c189024eb3b834c6c1e4f0f30a1", + "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1", "shasum": "" }, "require": { @@ -1299,7 +1299,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.20" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.21" }, "funding": [ { @@ -1315,7 +1315,7 @@ "type": "tidelift" } ], - "time": "2023-06-13T06:30:34+00:00" + "time": "2023-07-09T15:24:48+00:00" }, { "name": "psr/cache", @@ -2971,16 +2971,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.9", + "version": "9.6.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328", + "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", "shasum": "" }, "require": { @@ -3054,7 +3054,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10" }, "funding": [ { @@ -3070,7 +3070,7 @@ "type": "tidelift" } ], - "time": "2023-06-11T06:13:56+00:00" + "time": "2023-07-10T04:04:23+00:00" }, { "name": "psr/container",