gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#51 2 Business Points edit / add, user dashboard

Browse source
This commit is contained in:
Kevin Adametz 2022-07-22 13:43:24 +02:00
parent 263cf93a1e
commit dfd049aaa9
25 changed files with 1291 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

76
app/Services/BusinessPlan/SalesPointsVolume.php
View file

@ -2,6 +2,7 @@
namespace App\Services\BusinessPlan;
use App\User;
use App\Services\Util;
use App\Models\ShoppingOrder;
use App\Models\UserSalesVolume;
@ -29,7 +30,7 @@ class SalesPointsVolume
$form_user = User::find($form_user_id);
$shoppingOrder->user_sales_volume->user_id = $to_user_id;
$shoppingOrder->user_sales_volume->message = 'Punkte zugewiesen am: '.date('d.m.Y');
$shoppingOrder->user_sales_volume->message = 'zugewiesen: '.date('d.m.Y');
$syslog = $shoppingOrder->user_sales_volume->syslog;
$syslog[date('d.m.Y-h:i:s')] = 'change form: #'.$form_user_id.' '.$form_user->email.' to: #'.$to_user_id.' '.$to_user->email;
@ -57,7 +58,7 @@ class SalesPointsVolume
foreach($userSalesVolumes as $userSalesVolume){
switch ($userSalesVolume->status) {
case 1: //Bestellung
case 1: //Bestellung Berater
$month_points += $userSalesVolume->points;
$month_total_net += $userSalesVolume->total_net;
break;
@ -65,6 +66,10 @@ class SalesPointsVolume
$month_shop_points += $userSalesVolume->points;
$month_shop_total_net += $userSalesVolume->total_net;
break;
case 4: //add Berater
$month_points += $userSalesVolume->points;
$month_total_net += $userSalesVolume->total_net;
break;
}
$userSalesVolume->month_shop_points = $month_shop_points;
$userSalesVolume->month_shop_total_net = $month_shop_total_net;
@ -163,4 +168,71 @@ class SalesPointsVolume
}
public static function editSalesPointsVolume($data){
$user_sales_volume = UserSalesVolume::findOrFail($data['id']);
if(!$user_sales_volume->isCurrentMonthYear()){
\Session()->flash('alert-error', 'Änderung muss im selben Monat sein');
return;
}
$old_points = $user_sales_volume->points;
$old_total_net = $user_sales_volume->total_net;
$user_sales_volume->total_net = Util::reFormatNumber($data['total_net']);
$user_sales_volume->points = intval($data['points']);
$user_sales_volume->message = 'geändert: '.date('d.m.Y');
$syslog = $user_sales_volume->syslog;
$syslog[date('d.m.Y-h:i:s')] = 'edit points: #'.$old_points.' '.$user_sales_volume->points .' total: #'.$old_total_net.' '.$user_sales_volume->total_ne;
$user_sales_volume->syslog = $syslog;
$user_sales_volume->save();
self::reCalculateSalesPointsVolume($user_sales_volume->user_id, $user_sales_volume->month, $user_sales_volume->year);
\Session()->flash('alert-success', "Points geändert");
return;
}
public static function addSalesPointsVolume($data){
if(!isset($data['user_id'])){
\Session()->flash('alert-error', 'Kein Berater ausgewählt');
return;
}
$user = User::findOrFail($data['user_id']);
$month = date('m');
$year = date('Y');
$date = date('d.m.Y');
$total_net = isset($data['total_net']) ? Util::reFormatNumber($data['total_net']) : 0;
$points = isset($data['points']) ? intval($data['points']) : 0;
$syslog[date('d.m.Y-h:i:s')] = 'add points: #'.$points.' total: #'.$total_net;
$user_sales_volume = UserSalesVolume::create([
'user_id' => $user->id,
'shopping_order_id' => null,
'month' => $month,
'year' => $year,
'date' => $date,
'points' => $points,
'total_net' => $total_net,
'message' => 'hinzugefügt: '.date('d.m.Y'),
'syslog' => $syslog,
'status' => 4,
]);
self::reCalculateSalesPointsVolume($user_sales_volume->user_id, $user_sales_volume->month, $user_sales_volume->year);
\Session()->flash('alert-success', "Points hinzugefügt");
}
}

12
app/Services/Payment.php
View file

@ -25,6 +25,18 @@ class Payment
'NULL' => 'keine Zahlung',
];
public static $txaction_filter_text = [
'paid' => "Zahlung bezahlt",
'appointed' => "Zahlung offen",
'failed' => "Zahlung abbruch",
'extern' => "Extern offen", //offen
'extern_paid' => "Extern bezahlt",
'invoice_open' => "Rechnung offen",
'invoice_paid' => "Rechnung bezahlt",
'invoice_non' => "Rechnung keine Zahlung",
'NULL' => 'keine Zahlung',
];
public static $txaction_invoice = [
'invoice_open' => "Rechnung offen",
'invoice_paid' => "Rechnung bezahlt",

2
app/Services/Util.php
View file

@ -52,7 +52,7 @@ class Util
}
public static function _format_number($value){
return preg_replace("/[^0-9,]/", "", $value);
return preg_replace("/[^0-9,-]/", "", $value);
}