Updates to 03-2025
This commit is contained in:
parent
6167273a48
commit
9b54eb0512
348 changed files with 34535 additions and 5774 deletions
|
|
@ -83,31 +83,47 @@ class CreditRepository extends BaseRepository {
|
|||
return true;
|
||||
}
|
||||
|
||||
//beendet die Gutschrift
|
||||
private function finishUserCredit($user_credit){
|
||||
//next number
|
||||
Credit::makeNextCreditNumber();
|
||||
//mark as payed
|
||||
$ShoppingOrderMargins = UserMarign::getOrderFromPartnerCommissionByID($this->model->id);
|
||||
//Partner Provision
|
||||
$ShoppingOrderMargins = UserMarign::getPartnerCommissionItems($this->model->id, false);
|
||||
foreach($ShoppingOrderMargins as $ShoppingOrderMargin){
|
||||
$ShoppingOrderMargin->partner_commission_paid = true;
|
||||
$ShoppingOrderMargin->out_paid = true;
|
||||
$ShoppingOrderMargin->user_credit_id = $user_credit->id;
|
||||
$ShoppingOrderMargin->save();
|
||||
}
|
||||
|
||||
$UserCreditMargins = UserMarign::getUserCreditMarginByID($this->model->id);
|
||||
//Shop Provision
|
||||
$ShoppingOrderMargins = UserMarign::getShopCommissionItems($this->model->id, false);
|
||||
foreach($ShoppingOrderMargins as $ShoppingOrderMargin){
|
||||
$ShoppingOrderMargin->margin_paid = true;
|
||||
$ShoppingOrderMargin->out_paid = true;
|
||||
$ShoppingOrderMargin->user_credit_id = $user_credit->id;
|
||||
$ShoppingOrderMargin->save();
|
||||
}
|
||||
|
||||
//Hinzugefügte Provision
|
||||
$UserCreditMargins = UserMarign::getUserCreditMarginByUserID($this->model->id);
|
||||
foreach($UserCreditMargins as $UserCreditMargin){
|
||||
$UserCreditMargin->paid = true;
|
||||
$UserCreditMargin->paid = true; //wurde ausgezahlt
|
||||
$UserCreditMargin->user_credit_id = $user_credit->id;
|
||||
$UserCreditMargin->save();
|
||||
}
|
||||
}
|
||||
|
||||
//erstellt der Gutschrift
|
||||
private function makeUserCredit(){
|
||||
|
||||
$ret = new \stdClass();
|
||||
$ret->net = 0;
|
||||
$ret->margins = [];
|
||||
$ret->credits = [];
|
||||
$ShoppingOrderMargins = UserMarign::getOrderFromPartnerCommissionByID($this->model->id);
|
||||
|
||||
//Partner Provision
|
||||
$ShoppingOrderMargins = UserMarign::getPartnerCommissionItems($this->model->id, false);
|
||||
foreach($ShoppingOrderMargins as $ShoppingOrderMargin){
|
||||
$margin = new \stdClass();
|
||||
$margin->id = $ShoppingOrderMargin->id;
|
||||
|
|
@ -120,7 +136,22 @@ class CreditRepository extends BaseRepository {
|
|||
$ret->net += $ShoppingOrderMargin->net_partner_commission;
|
||||
}
|
||||
|
||||
$UserCreditMargins = UserMarign::getUserCreditMarginByID($this->model->id);
|
||||
//Shop Provision
|
||||
$ShoppingOrderMargins = UserMarign::getShopCommissionItems($this->model->id, false);
|
||||
foreach($ShoppingOrderMargins as $ShoppingOrderMargin){
|
||||
$margin = new \stdClass();
|
||||
$margin->id = $ShoppingOrderMargin->id;
|
||||
$margin->net = $ShoppingOrderMargin->net_discount;
|
||||
$margin->reference = $ShoppingOrderMargin->shopping_order->getLastShoppingPayment('reference');
|
||||
$margin->firstname = $ShoppingOrderMargin->shopping_order->shopping_user->billing_firstname;
|
||||
$margin->lastname = $ShoppingOrderMargin->shopping_order->shopping_user->billing_lastname;
|
||||
$margin->created_at = $ShoppingOrderMargin->shopping_order->created_at->format("d.m.Y");
|
||||
$ret->margins[] = $margin;
|
||||
$ret->net += $ShoppingOrderMargin->net_discount;
|
||||
}
|
||||
|
||||
//Hinzugefügte Provision
|
||||
$UserCreditMargins = UserMarign::getUserCreditMarginByUserID($this->model->id);
|
||||
foreach($UserCreditMargins as $UserCreditMargin){
|
||||
$credit = new \stdClass();
|
||||
$credit->id = $UserCreditMargin->id;
|
||||
|
|
@ -138,7 +169,7 @@ class CreditRepository extends BaseRepository {
|
|||
if($this->model->account){
|
||||
$ret->taxable = $this->model->account->taxable_sales == 2 ? false : true;
|
||||
if($ret->taxable){
|
||||
$ret->tax_rate = config('app.main_tax_number');
|
||||
$ret->tax_rate = config('app.main_tax_rate');
|
||||
$ret->total = round($ret->net * config('app.main_tax'), 2);
|
||||
$ret->tax = $ret->total - $ret->net;
|
||||
|
||||
|
|
@ -146,7 +177,6 @@ class CreditRepository extends BaseRepository {
|
|||
$ret->tax_rate = 0;
|
||||
$ret->total = $ret->net;
|
||||
$ret->tax = 0;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue