Completed
Push — development ( 2315d6...5d6c99 )
by Ashutosh
10:26
created
app/Http/Controllers/DashboardController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         $endSubscriptionDate = date('Y-m-d', strtotime('+3 months'));
60 60
         $status = $request->input('status');
61 61
 
62
-        return view('themes.default1.common.dashboard', compact('allowedCurrencies1','allowedCurrencies2','currency1Symbol','currency2Symbol','totalSalesCurrency2', 'totalSalesCurrency1', 'yearlySalesCurrency2', 'yearlySalesCurrency1', 'monthlySalesCurrency2', 'monthlySalesCurrency1', 'users','count_users', 'arraylists', 'productSoldlists','orders','subscriptions','invoices', 'products', 'arrayCountList', 'pendingPaymentCurrency2', 'pendingPaymentCurrency1', 'status','startSubscriptionDate',
62
+        return view('themes.default1.common.dashboard', compact('allowedCurrencies1', 'allowedCurrencies2', 'currency1Symbol', 'currency2Symbol', 'totalSalesCurrency2', 'totalSalesCurrency1', 'yearlySalesCurrency2', 'yearlySalesCurrency1', 'monthlySalesCurrency2', 'monthlySalesCurrency1', 'users', 'count_users', 'arraylists', 'productSoldlists', 'orders', 'subscriptions', 'invoices', 'products', 'arrayCountList', 'pendingPaymentCurrency2', 'pendingPaymentCurrency1', 'status', 'startSubscriptionDate',
63 63
                  'endSubscriptionDate'));
64 64
     }
65 65
 
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
         $today = Carbon::now()->toDateTimeString();
269 269
         $plus30Day = $dayUtc->toDateTimeString();
270 270
         $subsEnds = Subscription::where('update_ends_at', '>', $today)->where('update_ends_at', '<=', $plus30Day)
271
-        ->orderBy('update_ends_at','ASC')->get();
271
+        ->orderBy('update_ends_at', 'ASC')->get();
272 272
 
273 273
         return $subsEnds;
274 274
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Order/ExtendedOrderController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
             $tillDate = $this->getTillDate($expiryFrom, $expiryTill, $tills);
118 118
             $join = $join->whereBetween('subscriptions.update_ends_at', [$expiryFrom, $tillDate])
119
-            ->orderBy('subscriptions.update_ends_at','asc');
119
+            ->orderBy('subscriptions.update_ends_at', 'asc');
120 120
 
121 121
             return $join;
122 122
         }
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
             $froms = Subscription::first()->ends_at;
138 138
             $fromDate = $this->getFromDate($expiry, $froms);
139 139
             $join = $join->whereBetween('subscriptions.update_ends_at', [$fromDate, $exptill])
140
-            ->orderBy('subscriptions.update_ends_at','asc');
140
+            ->orderBy('subscriptions.update_ends_at', 'asc');
141 141
 
142 142
             return $join;
143 143
         }
Please login to merge, or discard this patch.