Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/Events/QuoteCreated.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php
namespace Insane\Journal\Events;
use Illuminate\Queue\SerializesModels;
use Insane\Journal\Models\Quote\Quote;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;

class QuoteCreated {
use Dispatchable, InteractsWithSockets, SerializesModels;

public function __construct(public Quote $quote, public array $quoteData = []) {}
}
12 changes: 12 additions & 0 deletions src/Events/QuoteDeleted.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php
namespace Insane\Journal\Events;
use Illuminate\Queue\SerializesModels;
use Insane\Journal\Models\Quote\Quote;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;

class QuoteCreated {
use Dispatchable, InteractsWithSockets, SerializesModels;

public function __construct(public Quote $quote) {}
}
11 changes: 11 additions & 0 deletions src/Events/QuoteSaving.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php
namespace Insane\Journal\Events;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;

class QuoteSaving {
use Dispatchable, InteractsWithSockets, SerializesModels;

public function __construct(public array $quoteData = []) {}
}
12 changes: 12 additions & 0 deletions src/Events/QuoteUpdated.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php
namespace Insane\Journal\Events;
use Illuminate\Queue\SerializesModels;
use Insane\Journal\Models\Quote\Quote;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;

class QuoteUpdated {
use Dispatchable, InteractsWithSockets, SerializesModels;

public function __construct(public Quote $quote, public array $quoteData = []) {}
}
48 changes: 48 additions & 0 deletions src/Helpers/ReportHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,54 @@ public static function getTransactionsByAccount(int $teamId, array $accounts, $s
return $groupBy ? $results->groupBy($groupBy) : $results;
}

public static function getTransactionsByCategory(int $teamId, array $accounts, $startDate = null, $endDate = null, $transactionableType = null) {
$endDate = $endDate ?? Carbon::now()->endOfMonth()->format('Y-m-d');
$startDate = $startDate ?? Carbon::now()->startOfMonth()->format('Y-m-d');

return DB::table('transaction_lines')
->whereBetween('transactions.date', [$startDate, $endDate])
->where([
'transaction_lines.team_id' => $teamId,
'transactions.status' => Transaction::STATUS_VERIFIED,
])
->when($transactionableType, fn ($q) => $q->where('transactionable_type', $transactionableType) )
->where(function($query) use ($accounts) {
$query
->whereIn('accounts.display_id', $accounts)
->orWhereIn('categories.display_id', $accounts)
->orWhereIn('g.display_id', $accounts);
})
->selectRaw('
sum(COALESCE(amount * transaction_lines.type, 0)) as total,
SUM(CASE
WHEN transaction_lines.type = 1 THEN transaction_lines.amount
ELSE 0
END) as income,
SUM(CASE
WHEN transaction_lines.type = -1 THEN transaction_lines.amount
ELSE 0
END) outcome,
accounts.id account_id,
group_concat(concat(transaction_lines.amount * transaction_lines.type, ":", transaction_lines.id)) details,
date_format(transaction_lines.date, "%Y-%m-01") as date,
accounts.display_id account_display_id,
accounts.name account_name,
accounts.alias account_alias,
categories.name,
categories.id,
categories.display_id,
categories.alias,
g.display_id groupName,
g.alias groupAlias,
MONTH(transactions.date) as months'
)->groupByRaw('date_format(transactions.date, "%Y-%m"), categories.id')
->join('accounts', 'accounts.id', '=', 'transaction_lines.account_id')
->join('categories', 'accounts.category_id', '=', 'categories.id')
->join('transactions', 'transactions.id', '=', 'transaction_id')
->join(DB::raw('categories g'), 'g.id', 'categories.parent_id')
->get();
}

public static function getAccountTransactionsByMonths(int $teamId, array $accounts, $startDate = null, $endDate = null, $groupBy = null, $transactionableType = null) {
$endDate = $endDate ?? Carbon::now()->endOfMonth()->format('Y-m-d');
$startDate = $startDate ?? Carbon::now()->startOfMonth()->format('Y-m-d');
Expand Down
96 changes: 96 additions & 0 deletions src/Jobs/Quote/CreateQuoteLine.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?php

namespace Insane\Journal\Jobs\quote;

use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Insane\Journal\Models\Quote\Quote;
use Illuminate\Queue\InteractsWithQueue;
use Insane\Journal\Models\Quote\QuoteLine;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Insane\Journal\Models\Quote\QuoteLineTax;

class CreateQuoteLine implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

public function __construct(public Quote $quote,public array $formData)
{
}

/**
* Execute the job.
*
* @return void
*/
public function handle()
{
QuoteLine::query()->where('quote_id', $this->quote->id)->delete();
QuoteLineTax::query()->where('quote_id', $this->quote->id)->delete();
if (isset($this->formData['items']) && count($this->formData['items'])) {
foreach ($this->formData['items'] as $index => $item) {
$line = $this->quote->lines()->create([
"team_id" => $this->quote->team_id,
"user_id" => $this->quote->user_id,
"concept" => $item['concept'],
"category_id" => $item['category_id'] ?? null,
"date" => $item['date'] ?? $this->quote->date,
"index" => $item['index'] ?? $index,
"product_id" => $item['product_id'] ?? null,
"quantity" => $item['quantity'],
"price" => $item['price'],
"amount" => $item['amount'],
"product_image" => $item['product_image'] ?? "",
"meta_data" => $item['meta_data'] ?? [],
]);

isset($item['taxes']) ? $this->createItemTaxes($item['taxes'], $line) : null;
}
} else {
$line = $this->quote->lines()->create([
"team_id" => $this->quote->team_id,
"user_id" => $this->quote->user_id,
"concept" => $this->quote->concept,
"category_id" => null,
"date" => $this->quote->date,
"index" => 0,
"product_id" => null,
"quantity" => 1,
"price" => $this->formData['total'],
"amount" => $this->formData['total'],
"product_image" => "",
"meta_data" => [],
]);

}

$this->quote->save();
return $this->quote;
}

private function createItemTaxes($taxes, $line) {
foreach ($taxes as $index => $tax) {
if (isset($tax['name'])) {
$taxRate = (double) $tax['rate'];
$taxLineTotal = (double) $taxRate * $line->amount / 100;
$line->taxes()->create([
"team_id" => $this->quote->team_id,
"user_id" => $this->quote->user_id,
"quote_id" => $this->quote->id,
"quote_line_id" => $line->id,
"tax_id" => $tax['id'],
"name" => $tax['name'],
"is_fixed" => $tax['is_fixed'],
"label" => $tax['label'],
"concept" => $tax['description'] ?? $tax['concept'],
"rate" => $taxRate,
"type" => $tax['type'],
"amount" => $tax['amount'] ?? $taxLineTotal,
"amount_base" => $line->amount,
"index" => $index,
]);
}
}
}
}
64 changes: 44 additions & 20 deletions src/Models/Invoice/Invoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -431,26 +431,50 @@ public static function createContactAccount($invoice)
public static function createInvoiceAccount($invoice)
{
if ($invoice->invoice_account_id) return $invoice->invoice_account_id;
$accounts = Account::where([
'display_id' => 'sales',
'team_id' => $invoice->team_id
])->limit(1)->get();

if (count($accounts)) {
return $accounts[0]->id;
} else {
$category = Category::where('display_id', 'operating_income')->first();
$account = Account::create([
"team_id" => $invoice->team_id,
"client_id" => 0,
"user_id" => $invoice->user_id,
"category_id" => $category->id,
"display_id" => "sales",
"name" => "Sales",
"currency_code" => "DOP"
]);
return $account->id;
}
if ($invoice->isOutgoingMovement()) {
$accounts = Account::where([
'display_id' => 'general_expenses',
'team_id' => $invoice->team_id
])->limit(1)->get();

if (count($accounts)) {
return $accounts[0]->id;
} else {
$category = Category::where('display_id', 'operating_expense')->first();
$account = Account::create([
"team_id" => $invoice->team_id,
"client_id" => 0,
"user_id" => $invoice->user_id,
"category_id" => $category->id,
"display_id" => "general_expenses",
"name" => "General Expenses",
"alias" => __("General Expenses"),
"currency_code" => "DOP"
]);
return $account->id;
}
} else {
$accounts = Account::where([
'display_id' => 'sales',
'team_id' => $invoice->team_id
])->limit(1)->get();

if (count($accounts)) {
return $accounts[0]->id;
} else {
$category = Category::where('display_id', 'operating_income')->first();
$account = Account::create([
"team_id" => $invoice->team_id,
"client_id" => 0,
"user_id" => $invoice->user_id,
"category_id" => $category->id,
"display_id" => "sales",
"name" => "Sales",
"currency_code" => "DOP"
]);
return $account->id;
}
}
}

public function getInvoiceData() {
Expand Down
Loading