diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php index 663b555..e9569c9 100644 --- a/app/Controllers/Admin_controller.php +++ b/app/Controllers/Admin_controller.php @@ -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 .=''.$row['order_id'].''.$date->format('M-d-Y').''.$row['transaction_id'].''.$cost.''.$row['member_name'].''.$row['status'].''; + $output .=''.$row['order_id'].''.$date->format('M d , Y').''.$row['transaction_id'].''.$cost.''.$row['member_name'].''.$row['status'].''; } echo $output .= ' '; } @@ -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 .=''.$data['credit_data'][$i]['order_id'].''.$date->format('M-d-Y').''.$expirydate->format('M-d-Y').''.$balance.''.$data['credit_data'][$i]['avaiable_credit'].''; + $output .=''.$data['credit_data'][$i]['order_id'].''.$date->format('M d , Y').''.$expirydate->format('M d , Y').''.$balance.''.$data['credit_data'][$i]['avaiable_credit'].''; } echo $output .= ' '; diff --git a/app/Models/Packages_and_pricing_model.php b/app/Models/Packages_and_pricing_model.php index ca63c30..624bc08 100644 --- a/app/Models/Packages_and_pricing_model.php +++ b/app/Models/Packages_and_pricing_model.php @@ -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']; } \ No newline at end of file diff --git a/app/Views/checkout.php b/app/Views/checkout.php index 91e7127..83986e1 100644 --- a/app/Views/checkout.php +++ b/app/Views/checkout.php @@ -271,7 +271,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
- + @@ -279,7 +279,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
- + @@ -289,7 +289,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
- + @@ -297,7 +297,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
- + @@ -305,7 +305,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
- + @@ -313,7 +313,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
- + @@ -334,7 +334,7 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
- + diff --git a/app/Views/credits_pack_form.php b/app/Views/credits_pack_form.php index b199d9a..59d0b40 100644 --- a/app/Views/credits_pack_form.php +++ b/app/Views/credits_pack_form.php @@ -64,6 +64,20 @@
+
+ +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/app/Views/credits_pack_list.php b/app/Views/credits_pack_list.php index 247e80b..047d2e8 100644 --- a/app/Views/credits_pack_list.php +++ b/app/Views/credits_pack_list.php @@ -35,9 +35,10 @@ Pack Name Pack Type - Points + Credits Cost - Status + Description + Offer Label Action @@ -49,9 +50,11 @@ - - - + + + + + diff --git a/app/Views/member_form.php b/app/Views/member_form.php index d941ced..024ef30 100644 --- a/app/Views/member_form.php +++ b/app/Views/member_form.php @@ -71,9 +71,9 @@
- +
- +
@@ -141,7 +141,7 @@
-

Change Password

+

Reset Password