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

alignment:GWM

Browse Source
This commit is contained in:
sriramv 2023-06-20 13:51:47 +05:30
parent 31591c7b27
commit aa5b7270f8
9 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Admin_controller.php
View File

@ -723,7 +723,7 @@ class Admin_controller extends BaseController
if($row['status'] == 'Success'){
$cost = json_decode($row['transaction'] , true)['payment']['amount_money']['amount'];
}else{$cost='';}
$output .='<tr><td>'.$row['order_id'].'</td><td>'.$date->format('M-d-Y').'</td><td>'.$row['transaction_id'].'</td><td>'.$cost.'</td></td><td>'.$row['member_name'].'</td></td><td>'.$row['status'].'</td></tr>';
$output .='<tr><td>'.$row['order_id'].'</td><td>'.$date->format('M d , Y').'</td><td>'.$row['transaction_id'].'</td><td>'.$cost.'</td></td><td>'.$row['member_name'].'</td></td><td>'.$row['status'].'</td></tr>';
}
echo $output .= '</tbody></table></div> ';
}
@ -1107,7 +1107,7 @@ class Admin_controller extends BaseController
$expirydate = new DateTime($data['credit_data'][$i]['expiring_date']);
if($data['credit_data'][$i]['running_balance'] > 0)
{$balance = "+ ".$data['credit_data'][$i]['running_balance'];}else{$balance = "- ".$data['credit_data'][$i]['used_points'];}
$output .='<tr><td>'.$data['credit_data'][$i]['order_id'].'</td><td>'.$date->format('M-d-Y').'</td><td>'.$expirydate->format('M-d-Y').'</td><td>'.$balance.'</td><td>'.$data['credit_data'][$i]['avaiable_credit'].'</td></tr>';
$output .='<tr><td>'.$data['credit_data'][$i]['order_id'].'</td><td>'.$date->format('M d , Y').'</td><td>'.$expirydate->format('M d , Y').'</td><td style="text-align: center;">'.$balance.'</td><td style="text-align: center;">'.$data['credit_data'][$i]['avaiable_credit'].'</td></tr>';
}
echo $output .= '</tbody></table></div> ';

2
app/Models/Packages_and_pricing_model.php
View File

@ -7,7 +7,7 @@ class Packages_and_pricing_model extends Model
protected $table = 'packages_and_pricing';
protected $primaryKey = 'id';
protected $allowedFields = ['package_name','package_type', 'credit','cost', 'is_active'];
protected $allowedFields = ['package_name','package_type', 'credit','cost','discription','offer_label', 'is_active'];
}

14
app/Views/checkout.php
View File

@ -271,7 +271,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-6 mb-3">
<label for="first_name">First Name</label>
<label for="first_name">First Name<span class="text-danger">*</span></label>
<input type="text" value="<?= $userdata[0]['name']; ?>" name="name" id="first_name" required>
<span id="first_name_span_message"> </span>
@ -279,7 +279,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-6 mb-3">
<label for="last_name">Last Name</label>
<label for="last_name">Last Name<span class="text-danger">*</span></label>
<input type="text" value="<?= $userdata[0]['last_name']; ?>" name="last_name" id="last_name" required>
<span id="last_name_span_message"> </span>
@ -289,7 +289,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-12 mb-3">
<label for="address">Street Address</label>
<label for="address">Street Address<span class="text-danger">*</span></label>
<input type="text" value="<?= $userdata[0]['address']; ?>" name="address" id="address" required>
<span id="address_span_message"> </span>
@ -297,7 +297,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-4 mb-3">
<label for="state">State</label>
<label for="state">Province<span class="text-danger">*</span></label>
<input type="text" name="state" id="state" value="<?= $userdata[0]['state']; ?>" required>
<span id="state_span_message"> </span>
@ -305,7 +305,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-4 mb-3">
<label for="city">City</label>
<label for="city">City<span class="text-danger">*</span></label>
<input type="text" value="<?= $userdata[0]['city']; ?>" name="city" id="city" required>
<span id="city_span_message"> </span>
@ -313,7 +313,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-4 mb-3">
<label for="country">Country</label>
<label for="country">Country<span class="text-danger">*</span></label>
<!-- <input type="text" name="country" id="country" value="<?= $userdata[0]['country']; ?>"> -->
@ -334,7 +334,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<div class="col-lg-4 mb-3">
<label for="zipcode">Postal Code</label>
<label for="zipcode">Postal Code<span class="text-danger">*</span></label>
<input type="text" name="pincode" id="pincode" value="<?= $userdata[0]['pincode']; ?>" required>
<span id="pincode_span_message"> </span>

14
app/Views/credits_pack_form.php
View File

@ -64,6 +64,20 @@
</div>
</div>
<div class="form-group row">
<label for="inputEmail3" class="col-4 col-form-label">Description<span class="text-danger">*</span></label>
<div class="col-7">
<input type="text" required class="form-control" name="credit" value="<?php if(isset($PackageData)){echo $PackageData[0]['discription'];} ?>" placeholder="Description">
</div>
</div>
<div class="form-group row">
<label for="inputEmail3" class="col-4 col-form-label">Offer Label<span class="text-danger">*</span></label>
<div class="col-7">
<input type="text" required class="form-control" name="cost" value="<?php if(isset($PackageData)){echo $PackageData[0]['offer_label'];} ?>" placeholder="Offer Label">
</div>
</div>
<div class="form-group row">

13
app/Views/credits_pack_list.php
View File

@ -35,9 +35,10 @@
<tr>
<th>Pack Name</th>
<th>Pack Type</th>
<th>Points</th>
<th>Credits</th>
<th>Cost</th>
<th>Status</th>
<th>Description</th>
<th>Offer Label</th>
<th>Action</th>
</tr>
</thead>
@ -49,9 +50,11 @@
<tr>
<td><?php echo $row['package_name'];?></td>
<td><?php echo $row['package_type'];?></td>
<td><?php echo $row['credit'];?></td>
<td><?php echo $row['cost'];?></td>
<td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "In-Active"; }?></td>
<td style="text-align: center;"><?php echo $row['credit'];?></td>
<td style="text-align: center;"><?php echo $row['cost'];?></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> -->
<td><a href="<?= base_url() ?>credits_pack_edit/<?php echo md5($row['id']);?>"><i class="mdi mdi-lead-pencil" style="font-size:18px;"></a></td>

6
app/Views/member_form.php
View File

@ -71,9 +71,9 @@
</div>
<div class="form-group row">
<label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
<label for="inputEmail3" class="col-4 col-form-label">Province<span class="text-danger"></span></label>
<div class="col-7">
<input type="text" class="form-control" id="state" name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="State" >
<input type="text" class="form-control" id="state" name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="Province" >
</div>
</div>
@ -141,7 +141,7 @@
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Change Password </h4>
<h4 class="page-title"> Reset Password </h4>
<div class="page-title-right">
<ol class="breadcrumb m-0">
<!-- <li class="breadcrumb-item"><a href="javascript: void(0);">Minton</a></li>

21
app/Views/members_list.php
View File

@ -8,6 +8,23 @@
color: #002B60;
border-color: #000;
}
.test {
box-shadow: 0 2px 6px 0 rgba(0,86,193,.5);
cursor: pointer;
color: #fff;
font-size: 15px;
padding: 10px;
width: 55px;
height: 25px;
line-height: 8px;
background: #00B4D5;
border-radius: 5px;
font-weight: 500;
display: block;
}
/* th{
text-align: center;
} */
</style>
<!-- start page title -->
<div class="row">
@ -61,9 +78,9 @@
<tr>
<td hidden><?php echo $row['id'];?></td>
<td><?php echo $row['name'];?></td>
<td><?php echo $row['mobile'];?></td>
<td style="text-align: center;"><?php echo $row['mobile'];?></td>
<td><?php echo $row['email'];?></td>
<td class="credit_usage" id="<?php echo md5($row['id']);?>"><?php echo $row['credits'];?></td>
<td class="credit_usage" style="text-align: center;" id="<?php echo md5($row['id']);?>"><span class="test"><?php echo $row['credits'];?></span></td>
<td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "Deactive"; }?></td>
<td><a href="<?= base_url() ?>member_edit/<?php echo md5($row['id']);?>"><i class="mdi mdi-lead-pencil" style="font-size:18px;"></i></a>
<?php if ($row['is_active'] == 1) { ?>

2
app/Views/transactions_list.php
View File

@ -63,7 +63,7 @@
{ ?>
<tr class="order_details" id="<?php echo $row['member_id'];?>">
<td><?php echo $row['order_id'];?></td>
<td><?php $date = new DateTime($row['created_at']); echo $date->format('M-d-Y'); ?></td>
<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'];

4
app/Views/user_form.php
View File

@ -87,9 +87,9 @@
</div>
<div class="form-group row">
<label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
<label for="inputEmail3" class="col-4 col-form-label">Province<span class="text-danger"></span></label>
<div class="col-7">
<input type="text" class="form-control" id="state" name="state" value="<?php if(isset($userList)){echo $userList[0]['state'];} ?>" placeholder="State">
<input type="text" class="form-control" id="state" name="state" value="<?php if(isset($userList)){echo $userList[0]['state'];} ?>" placeholder="Province">
</div>
</div>