GOLF/golf_backend
GOLF/golf_backend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

point:GWM

Browse Source
This commit is contained in:
sriramv 2023-07-19 19:01:59 +05:30
parent 6bca3d4373
commit 9eaa221b95
7 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Admin_controller.php
View File

@ -739,8 +739,8 @@ class Admin_controller extends BaseController
$output = '<div class="table-responsive"><table class="table mb-0"><thead class="thead-light"><tr> <th>Order Id</th><th>Package Name</th><th>Cost</th><th>Total Amount</th><th>Credits</th><th>Payment Status</th></tr></thead><tbody>';
foreach ($creditsData as $row) {
if($row['is_active'] == 1 ){ $status = 'Success';}else{ $status = 'Failed';}
$output .='<tr><td>'.$row['order_id'].'</td><td>'.$row['package_name'].'</td><td>'.$row['cost'].'</td></td><td>'.$row['cost_with_tax'].'</td></td><td>'.$row['credit_points'].'</td><td>'.$status.'</td></tr>';
$cost_with_tax = number_format($row['cost_with_tax'], 2, '.', '');
$output .='<tr><td>'.$row['order_id'].'</td><td>'.$row['package_name'].'</td><td>'.$row['cost'].'</td></td><td>'.$cost_with_tax.'</td></td><td>'.$row['credit_points'].'</td><td>'.$status.'</td></tr>';
}
echo $output .= '</tbody></table></div> ';

2
app/Controllers/PaymentController.php
View File

@ -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) );

2
app/Views/credits_pack_list.php
View File

@ -51,7 +51,7 @@
<td><?php echo $row['package_name'];?></td>
<td><?php echo $row['package_type'];?></td>
<td style="text-align: center;"><?php echo $row['credit'];?></td>
<td style="text-align: center;"><?php echo $row['cost'];?></td>
<td style="text-align: center;"><?php $number = $row['cost']; echo number_format($number, 2, '.', '');?></td>
<td><?php echo $row['discription'];?></td>
<td><?php echo $row['offer_label'];?></td>
<!-- <td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "In-Active"; }?></td> -->

2
app/Views/members_list.php
View File

@ -77,7 +77,7 @@
{ ?>
<tr>
<td hidden><?php echo $row['id'];?></td>
<td><?php echo $row['name'];?></td>
<td><?php echo $row['name']." ".$row['last_name'];?></td>
<td style="text-align: center;"><?php echo $row['mobile'];?></td>
<td><?php echo $row['email'];?></td>
<td class="credit_usage" style="text-align: center;" id="<?php echo md5($row['id']);?>"><span class="test"><?php echo $row['credits'];?></span></td>

2
app/Views/success_mail.php
View File

@ -73,7 +73,7 @@
<div class="product-name"><?php echo $val['package_name']." (".$val['cost']." x ".$val['pack_count'].")"; ?></div>
<div class="credits-number"><?php echo $val['credit_points']; ?> Credits</div>
</td>
<td style=" border-bottom: 1px solid #ededed;"><span class="price-symbol">$</span><?php echo $val['costSum']; ?></td>
<td style=" border-bottom: 1px solid #ededed;"><span class="price-symbol">$</span><?php $number = $val['costSum']; echo number_format($number, 2, '.', ''); ?></td>
</tr>
<?php } ?>
<tr>

3
app/Views/transactions_list.php
View File

@ -66,7 +66,8 @@
<td><?php $date = new DateTime($row['created_at']); echo $date->format('M d , Y'); ?></td>
<td><?php echo $row['transaction_id'];?></td>
<td><?php if($row['status'] == 'Success'){
echo json_decode($row['transaction'] , true)['payment']['amount_money']['amount'];
$number = json_decode($row['transaction'] , true)['payment']['amount_money']['amount'] / 100;
echo number_format($number, 2, '.', '');
}
?></td>
<td><?php echo $row['member_name'];?></td>

60
composer.lock generated
View File

@ -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",