From 31b9a52e3b4a63383cdc4cbe16c3b023b015be6f Mon Sep 17 00:00:00 2001
From: nanthakumar5
Date: Wed, 28 Dec 2022 12:57:41 +0530
Subject: [PATCH] cc
---
app/Controllers/Common/Cron.php | 38 +++++++++++++++-----
app/Helpers/custom_helper.php | 31 +++++++++++-----
app/Views/site/myaccount/dashboard/index.php | 8 ++---
3 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/app/Controllers/Common/Cron.php b/app/Controllers/Common/Cron.php
index 825d088..dcf1d71 100644
--- a/app/Controllers/Common/Cron.php
+++ b/app/Controllers/Common/Cron.php
@@ -38,20 +38,32 @@ public function cartremoval()
public function bookingenddate()
{
- $date = date('Y-m-d');
-
- $booking = $this->db->table('booking_details bd')
+ $date = date('Y-m-d');
+ $booking = $this->db->table('booking_details bd')
->join('booking b', 'b.id = bd.booking_id', 'left')
+ ->join('stall s', 's.id = bd.stall_id', 'left')
->select('bd.stall_id, b.check_out checkout')
- ->where(['b.check_out'=> $date])
+ ->where(['b.check_out' => $date])
+ ->groupStart()->where('s.lock_unlock', '0')->orWhere('s.dirty_clean', '0')->groupEnd()
->get()
->getResultArray();
if(count($booking) > 0){
+ createDirectory('./assets/uploads/cron');
+ $fp = fopen('./assets/uploads/cron/cron.txt', 'a');
+
foreach($booking as $booking){
- $result = $this->booking->updatedata(['stallid' => $booking['stall_id'], 'lockunlock' => '0', 'dirtyclean' => '0' ]);
+ if($date > $booking['checkout']){
+ fwrite($fp, date('d-m-Y H:i:s').' --- Cron Lock & Dirty'.PHP_EOL);
+ fwrite($fp, json_encode($booking).PHP_EOL);
+
+ $this->db->table('booking_details bd')->update(['lock_unlock' => '0', 'dirty_clean' => '0'], ['id' => $booking['stall_id']]);
+ }
}
+
+ fclose($fp);
}
+
die;
}
@@ -68,10 +80,20 @@ public function bookingsubscriptionstall()
->get()
->getResultArray();
- foreach($payments as $payment){
- if($payment['plan_period_end'] < $fdatetime && $payment['booking_details_id']!=''){
- $this->db->table('booking_details')->where(['id' => $payment['booking_details_id']])->update(['subscription_status' => '0']);
+ if(count($payments) > 0){
+ createDirectory('./assets/uploads/cron');
+ $fp = fopen('./assets/uploads/cron/cron.txt', 'a');
+
+ foreach($payments as $payment){
+ if($payment['plan_period_end'] < $fdatetime && $payment['booking_details_id']!=''){
+ fwrite($fp, date('d-m-Y H:i:s').' --- Cron Payment'.PHP_EOL);
+ fwrite($fp, json_encode($payment).PHP_EOL);
+
+ $this->db->table('booking_details')->where(['id' => $payment['booking_details_id']])->update(['subscription_status' => '0']);
+ }
}
+
+ fclose($fp);
}
die;
diff --git a/app/Helpers/custom_helper.php b/app/Helpers/custom_helper.php
index 2702755..483090b 100644
--- a/app/Helpers/custom_helper.php
+++ b/app/Helpers/custom_helper.php
@@ -329,29 +329,42 @@ function getCart($type=''){
$singleprice = 0;
$singletotal = 0;
$mwnpricelist = explode(',', $res['mwn_price']);
+ $mpl = $mwnpricelist[0];
+ $wpl = $mwnpricelist[1];
+ $npl = $mwnpricelist[2];
$mwnprice = $mwninterval = $mwntotal = [0, 0, 0];
-
- $monthcalc = intdiv($intervalcalc, 30);
- if($monthcalc > 0){
- $mwnprice[0] = $mwnpricelist[0];
+
+ if($mpl!=0 && (($wpl!=0 && $npl!=0) || ($wpl!=0 && $npl==0) || ($wpl==0 && $npl!=0) || ($wpl==0 && $npl==0))){
+ if(($wpl!=0 && $npl!=0) || ($wpl!=0 && $npl==0) || ($wpl==0 && $npl!=0)){
+ $monthcalc = intdiv($intervalcalc, 30);
+ }elseif($wpl==0 && $npl==0){
+ $monthcalc = ceil($intervalcalc/30);
+ }
+
+ $mwnprice[0] = $mpl;
$mwninterval[0] = $monthcalc;
$mwntotal[0] = $mwnprice[0] * $mwninterval[0];
$singletotal += $mwntotal[0];
$intervalcalc = $intervalcalc - (30 * $monthcalc);
}
+
+ if($wpl!=0 && (($mpl!=0 && $npl!=0) || ($mpl!=0 && $npl==0) || ($mpl==0 && $npl!=0) || ($mpl==0 && $npl==0))){
+ if(($mpl!=0 && $npl!=0) || ($mpl==0 && $npl!=0)){
+ $weekcalc = intdiv($intervalcalc, 7);
+ }elseif(($mpl==0 && $npl==0) || ($mpl!=0 && $npl==0)){
+ $weekcalc = ceil($intervalcalc/7);
+ }
- $weekcalc = intdiv($intervalcalc, 7);
- if($weekcalc > 0){
- $mwnprice[1] = $mwnpricelist[1];
+ $mwnprice[1] = $wpl;
$mwninterval[1] = $weekcalc;
$mwntotal[1] = $mwnprice[1] * $mwninterval[1];
$singletotal += $mwntotal[1];
$intervalcalc = $intervalcalc - (7 * $weekcalc);
}
- if($intervalcalc > 0){
- $mwnprice[2] = $mwnpricelist[2];
+ if($npl!=0 && $intervalcalc > 0){
+ $mwnprice[2] = $npl;
$mwninterval[2] = $intervalcalc;
$mwntotal[2] = $mwnprice[2] * $mwninterval[2];
$singletotal += $mwntotal[2];
diff --git a/app/Views/site/myaccount/dashboard/index.php b/app/Views/site/myaccount/dashboard/index.php
index 5b35ae8..640b9c1 100644
--- a/app/Views/site/myaccount/dashboard/index.php
+++ b/app/Views/site/myaccount/dashboard/index.php
@@ -7,7 +7,7 @@
Today Checkin Event';
+ echo '
Today Check In Event
';
if(!empty($checkinstall)){
echo '
';
echo '
';
@@ -77,12 +77,12 @@
}
}
}else{
- echo "
No Stalls Checkin Today
";
+ echo "
No Stalls Check In Today
";
}
echo "
";
- echo '
Today Checkout Event
';
+ echo '
Today Check Out Event
';
if(!empty($checkoutstall)){
echo '
';
echo '
';
@@ -150,7 +150,7 @@
}
}
}else{
- echo "
No Stalls Checkout Today
";
+ echo "
No Stalls Check Out Today
";
}
}?>