update gitignore composer.js
All checks were successful
All checks were successful
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -22,3 +22,4 @@ yarn-error.log
|
|||||||
.camel-jbang
|
.camel-jbang
|
||||||
dump/
|
dump/
|
||||||
db/
|
db/
|
||||||
|
composer.lock
|
||||||
@@ -39,7 +39,7 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
|
|||||||
WORKDIR /var/www/html
|
WORKDIR /var/www/html
|
||||||
|
|
||||||
# Copy ONLY composer files first
|
# Copy ONLY composer files first
|
||||||
COPY composer.json composer.lock ./
|
COPY composer.json ./
|
||||||
|
|
||||||
# Create storage and bootstrap directories needed for composer scripts
|
# Create storage and bootstrap directories needed for composer scripts
|
||||||
RUN mkdir -p storage/framework/cache \
|
RUN mkdir -p storage/framework/cache \
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ public function revenue()
|
|||||||
$data['loss'] = Sale::where('business_id', auth()->user()->business_id)
|
$data['loss'] = Sale::where('business_id', auth()->user()->business_id)
|
||||||
->whereYear('created_at', request('year') ?? date('Y'))
|
->whereYear('created_at', request('year') ?? date('Y'))
|
||||||
->where('lossProfit', '<', 0)
|
->where('lossProfit', '<', 0)
|
||||||
->selectRaw('MONTHNAME(created_at) as month, SUM(ABS(lossProfit)) as total')
|
->selectRaw("TO_CHAR(created_at, 'Month') as month, SUM(ABS(lossProfit)) as total")
|
||||||
->orderBy('created_at')
|
->orderBy('created_at')
|
||||||
->groupBy('created_at')
|
->groupBy('created_at')
|
||||||
->get();
|
->get();
|
||||||
@@ -204,7 +204,7 @@ public function revenue()
|
|||||||
$data['profit'] = Sale::where('business_id', auth()->user()->business_id)
|
$data['profit'] = Sale::where('business_id', auth()->user()->business_id)
|
||||||
->whereYear('created_at', request('year') ?? date('Y'))
|
->whereYear('created_at', request('year') ?? date('Y'))
|
||||||
->where('lossProfit', '>=', 0)
|
->where('lossProfit', '>=', 0)
|
||||||
->selectRaw('MONTHNAME(created_at) as month, SUM(ABS(lossProfit)) as total')
|
->selectRaw("TO_CHAR(created_at, 'Month') as month, SUM(ABS(lossProfit)) as total")
|
||||||
->orderBy('created_at')
|
->orderBy('created_at')
|
||||||
->groupBy('created_at')
|
->groupBy('created_at')
|
||||||
->get();
|
->get();
|
||||||
|
|||||||
@@ -241,7 +241,7 @@ public function incomeExpense(Request $request)
|
|||||||
$data['expenses'] = Sale::where('business_id', auth()->user()->business_id)
|
$data['expenses'] = Sale::where('business_id', auth()->user()->business_id)
|
||||||
->whereYear('created_at', request('year') ?? date('Y'))
|
->whereYear('created_at', request('year') ?? date('Y'))
|
||||||
->where('lossProfit', '<', 0)
|
->where('lossProfit', '<', 0)
|
||||||
->selectRaw('MONTH(created_at) as month_number, MONTHNAME(created_at) as month, SUM(ABS(lossProfit)) as total')
|
->selectRaw("EXTRACT(MONTH FROM created_at) as month_number, TO_CHAR(created_at, 'Month') as month, SUM(ABS(lossProfit)) as total")
|
||||||
->groupBy('month_number', 'month')
|
->groupBy('month_number', 'month')
|
||||||
->orderBy('month_number')
|
->orderBy('month_number')
|
||||||
->get();
|
->get();
|
||||||
@@ -249,7 +249,7 @@ public function incomeExpense(Request $request)
|
|||||||
$data['incomes'] = Sale::where('business_id', auth()->user()->business_id)
|
$data['incomes'] = Sale::where('business_id', auth()->user()->business_id)
|
||||||
->whereYear('created_at', request('year') ?? date('Y'))
|
->whereYear('created_at', request('year') ?? date('Y'))
|
||||||
->where('lossProfit', '>=', 0)
|
->where('lossProfit', '>=', 0)
|
||||||
->selectRaw('MONTH(created_at) as month_number, MONTHNAME(created_at) as month, SUM(ABS(lossProfit)) as total')
|
->selectRaw("EXTRACT(MONTH FROM created_at) as month_number, TO_CHAR(created_at, 'Month') as month, SUM(ABS(lossProfit)) as total")
|
||||||
->groupBy('month_number', 'month')
|
->groupBy('month_number', 'month')
|
||||||
->orderBy('month_number')
|
->orderBy('month_number')
|
||||||
->get();
|
->get();
|
||||||
|
|||||||
Reference in New Issue
Block a user