diff --git a/_todo.txt b/_todo.txt index 139597f9..8b137891 100644 --- a/_todo.txt +++ b/_todo.txt @@ -1,2 +1 @@ - diff --git a/app/Console/Commands/BusinessStore.php b/app/Console/Commands/BusinessStore.php index 911c2c70..809e7700 100644 --- a/app/Console/Commands/BusinessStore.php +++ b/app/Console/Commands/BusinessStore.php @@ -31,7 +31,7 @@ class BusinessStore extends Command private $year; private $sendCreditMail = false; - private $sendUpdateMail = true; + private $sendUpdateMail = false; @@ -83,7 +83,7 @@ class BusinessStore extends Command //$this->storeBusinessStructureUsersDetailPeriod(1, 6); //erstellt die Gutschriften - //$this->userBusinessCommissionsToCredit(); + $this->userBusinessCommissionsToCredit(); //erstellt aus den Gutschriften die PDFs //$this->userCreatePaymentCreditsPDF(); @@ -119,7 +119,7 @@ class BusinessStore extends Command foreach($userBusinesses as $userBusiness){ $ret = $userPaymentCredits->addUserCreditItem($userBusiness); - $this->info('userBusinessCredit: '.$ret->user_id.' : Team: '.$ret->commission_team_total.' | Shop: '.$ret->commission_shop_sales); + $this->info('userBusinessCredit: '.$ret->user_id.' : Team: '.$ret->commission_pp_total.' | Shop: '.$ret->commission_shop_sales); } $diff = microtime(true) - $this->timeStart; $sec = intval($diff); diff --git a/app/Cron/BusinessUsersStore.php b/app/Cron/BusinessUsersStore.php index 71c913ee..2576eabc 100644 --- a/app/Cron/BusinessUsersStore.php +++ b/app/Cron/BusinessUsersStore.php @@ -47,17 +47,20 @@ class BusinessUsersStore } foreach($this->user_business_structure->users as $user_id=>$completed){ if($completed === 0){ - $user = User::findOrFail($user_id); - $TreeCalcBot = new TreeCalcBot($this->month, $this->year, 'admin'); - $TreeCalcBot->initBusinesslUserDetail($user); - if(!$TreeCalcBot->business_user){ - abort(403, 'not found TreeCalcBot->business_user'); + $user = User::find($user_id); + if($user){ + $TreeCalcBot = new TreeCalcBot($this->month, $this->year, 'admin'); + $TreeCalcBot->initBusinesslUserDetail($user); + if(!$TreeCalcBot->business_user){ + abort(403, 'not found TreeCalcBot->business_user'); + } + $this->storeBusinesslUser($TreeCalcBot->business_user); + $users = $this->user_business_structure->users; + $users[$user_id] = 1; + $this->user_business_structure->users = $users; + $this->user_business_structure->save(); } - $this->storeBusinesslUser($TreeCalcBot->business_user); - $users = $this->user_business_structure->users; - $users[$user_id] = 1; - $this->user_business_structure->users = $users; - $this->user_business_structure->save(); + } } } diff --git a/app/Cron/UserLevelUpdate.php b/app/Cron/UserLevelUpdate.php index 71df4f13..88e5d96b 100644 --- a/app/Cron/UserLevelUpdate.php +++ b/app/Cron/UserLevelUpdate.php @@ -41,7 +41,7 @@ class UserLevelUpdate $userBusiness->save(); $ret = $nextQualUserLevel['id'].' '.$nextQualUserLevel['name']; if($send_update_mail){ - self::sendUpdateMail($userBusiness->user, $userBusiness->total_qual_tp, $nextQualUserLevel['name']); + self::sendUpdateMail($userBusiness->user, $userBusiness->total_qual_pp, $nextQualUserLevel['name']); } } diff --git a/app/Cron/UserPaymentCredits.php b/app/Cron/UserPaymentCredits.php index 90ec5a6d..aac5ca74 100644 --- a/app/Cron/UserPaymentCredits.php +++ b/app/Cron/UserPaymentCredits.php @@ -25,7 +25,7 @@ class UserPaymentCredits ->where('user_businesses.month', '=', $this->month) ->where('user_businesses.year', '=', $this->year) ->where(function($q) { - return $q->where('user_businesses.commission_team_total', '>', 0) + return $q->where('user_businesses.commission_pp_total', '>', 0) ->orWhere('user_businesses.commission_shop_sales', '>', 0); }) ->get(); @@ -46,17 +46,28 @@ class UserPaymentCredits ]); } } - if($userBusiness->commission_team_total > 0){ + if($userBusiness->commission_pp_total > 0){ if($this->hasNotUserCreditItem($userBusiness, 2)){ UserCreditItem::create([ 'user_id' => $userBusiness->user_id, 'user_business_id' => $userBusiness->id, - 'credit' => $userBusiness->commission_team_total, - 'message' => 'Provision Team '.$date, + 'credit' => $userBusiness->commission_pp_total, + 'message' => 'Provision Payline '.$date, 'status' => 2, ]); } } + if($userBusiness->commission_growth_total > 0){ + if($this->hasNotUserCreditItem($userBusiness, 5)){ + UserCreditItem::create([ + 'user_id' => $userBusiness->user_id, + 'user_business_id' => $userBusiness->id, + 'credit' => $userBusiness->commission_growth_total, + 'message' => 'Provision Wachstumsbonus '.$date, + 'status' => 5, + ]); + } + } return $userBusiness; } @@ -74,7 +85,7 @@ class UserPaymentCredits $user = User::findOrFail($user_id); $data = []; if($credit_send_mail){ - $data['credit_send_mail'] = true; + $data['credit_send_mail'] = false; } $credit_repo = new CreditRepository($user); return $credit_repo->create($data); diff --git a/app/Exports/UserTeamExport.php b/app/Exports/UserTeamExport.php new file mode 100644 index 00000000..0767de01 --- /dev/null +++ b/app/Exports/UserTeamExport.php @@ -0,0 +1,33 @@ +collection = $data; + $this->headings = $header; + } + + public function collection() + { + return collect($this->collection); + } + + public function headings(): array + { + return [$this->headings]; + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/BusinessCommissionController.php b/app/Http/Controllers/BusinessCommissionController.php index cb4b89bf..a83e8619 100644 --- a/app/Http/Controllers/BusinessCommissionController.php +++ b/app/Http/Controllers/BusinessCommissionController.php @@ -85,7 +85,7 @@ class BusinessCommissionController extends Controller if(intval(Request::get('commissions_filter_show')) === 1){ $query->where(function($q) { - return $q->where('user_businesses.commission_team_total', '>', 0) + return $q->where('user_businesses.commission_pp_total', '>', 0) ->orWhere('user_businesses.commission_shop_sales', '>', 0); }); } @@ -113,15 +113,15 @@ class BusinessCommissionController extends Controller ->addColumn('commission_total', function (UserBusiness $UserBusiness) { - $commission_total = $UserBusiness->commission_team_total + $UserBusiness->commission_shop_sales; + $commission_total = $UserBusiness->commission_pp_total + $UserBusiness->commission_shop_sales; return $commission_total > 0 ? ''.formatNumber($commission_total).' €' : $commission_total.' €'; }) - ->addColumn('commission_team_total', function (UserBusiness $UserBusiness) { - return $UserBusiness->commission_team_total > 0 ? - ''.formatNumber($UserBusiness->commission_team_total).' €' - : $UserBusiness->commission_team_total.' €'; + ->addColumn('commission_pp_total', function (UserBusiness $UserBusiness) { + return $UserBusiness->commission_pp_total > 0 ? + ''.formatNumber($UserBusiness->commission_pp_total).' €' + : $UserBusiness->commission_pp_total.' €'; }) ->addColumn('commission_shop_sales', function (UserBusiness $UserBusiness) { return $UserBusiness->commission_shop_sales > 0 ? @@ -157,13 +157,13 @@ class BusinessCommissionController extends Controller })*/ ->orderColumn('id', 'id $1') - ->orderColumn('commission_team_total', 'commission_team_total $1') + ->orderColumn('commission_pp_total', 'commission_pp_total $1') ->orderColumn('commission_shop_sales', 'commission_shop_sales $1') ->orderColumn('email', 'users.email $1') ->orderColumn('m_account', 'm_account $1') ->orderColumn('first_name', 'first_name $1') ->orderColumn('last_name', 'last_name $1') - ->rawColumns(['id', 'commission_total', 'commission_team_total', 'commission_shop_sales', 'active_account']) + ->rawColumns(['id', 'commission_total', 'commission_pp_total', 'commission_shop_sales', 'active_account']) ->make(true); } } \ No newline at end of file diff --git a/app/Http/Controllers/BusinessController.php b/app/Http/Controllers/BusinessController.php index add5231e..bf70a66e 100644 --- a/app/Http/Controllers/BusinessController.php +++ b/app/Http/Controllers/BusinessController.php @@ -60,7 +60,6 @@ class BusinessController extends Controller $data = []; $data['month'] = session('business_user_filter_month'); $data['year'] = session('business_user_filter_year'); - $TreeCalcBot = new TreeCalcBot($data['month'], $data['year'], 'admin'); $TreeCalcBot->initBusinesslUserDetail($user); if(!$TreeCalcBot->business_user){ @@ -117,7 +116,7 @@ class BusinessController extends Controller $this->year = Request::get('business_user_filter_year'); //only the currently month get from Users -> older month from UserBusiness - //return $this->userCurrentlyDatatable(); + return $this->userCurrentlyDatatable(); if(TreeCalcBot::isFromStored($this->month, $this->year)){ return $this->userStoredDatatable(); }else{ @@ -155,8 +154,8 @@ class BusinessController extends Controller data-back="" data-modal="modal-xl" data-init_from="admin" - data-route="'.route('modal_load').'">'; - //.''; + data-route="'.route('modal_load').'">'. + (config('app.debug') === true ? '' : ''); }) ->addColumn('m_account', function (UserBusiness $userBusiness) { return $userBusiness->m_account; @@ -167,13 +166,13 @@ class BusinessController extends Controller ->addColumn('is_qual_kp', function (UserBusiness $userBusiness) { if($userBusiness->m_level_id){ $isQualKP = ($userBusiness->sales_volume_points_sum >= $userBusiness->qual_kp) ? true : false; - return ' KD '.$userBusiness->qual_kp.''; + return ' KP '.$userBusiness->qual_kp.''; } return '-'; }) - ->addColumn('sales_volume_points', function (UserBusiness $userBusiness) { + ->addColumn('sales_volume_KP_points', function (UserBusiness $userBusiness) { return '
'.$userBusiness->sales_volume_points_sum.'
'. - 'E: '.$userBusiness->sales_volume_points.' | S: '.$userBusiness->sales_volume_points_shop.''; + 'E: '.$userBusiness->sales_volume_KP_points.' | S: '.$userBusiness->sales_volume_points_shop.''; }) ->addColumn('sales_volume_total', function (UserBusiness $userBusiness) { return '
'.formatNumber($userBusiness->sales_volume_total_sum).' €
'. @@ -199,7 +198,7 @@ class BusinessController extends Controller data-back="" data-modal="modal-xl" data-init_from="admin" - data-route="'.route('modal_load').'">
'; + data-route="'.route('modal_load').'">
'; $sponsor .= ''.$userBusiness->sponsor->email; $sponsor .= ' | '.$userBusiness->sponsor->m_account; @@ -246,7 +245,7 @@ class BusinessController extends Controller ->orderColumn('first_name', 'first_name $1') ->orderColumn('last_name', 'last_name $1') ->orderColumn('active_account', 'payment_account $1') - ->rawColumns(['id', 'is_qual_kp', 'sales_volume_points', 'sales_volume_total', 'sponsor', 'active_account']) + ->rawColumns(['id', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total', 'sponsor', 'active_account']) ->make(true); } @@ -289,8 +288,8 @@ class BusinessController extends Controller data-back="" data-modal="modal-xl" data-init_from="admin" - data-route="'.route('modal_load').'">'; - //.''; + data-route="'.route('modal_load').'">'. + (config('app.debug') === true ? '' : ''); }) ->addColumn('m_account', function (User $user) { return $user->account ? $user->account->m_account : ''; @@ -301,15 +300,15 @@ class BusinessController extends Controller ->addColumn('is_qual_kp', function (User $user) { if($user->user_level){ $qual_kp = $user->user_level->qual_kp; - $sales_volume_points_sum = $user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_points_sum'); + $sales_volume_points_sum = $user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_points_KP_sum'); $isQualKP = ($sales_volume_points_sum >= $qual_kp) ? true : false; - return ' KD '.$qual_kp.''; + return ' KP '.$qual_kp.''; } return '-'; }) - ->addColumn('sales_volume_points', function (User $user) { - return '
'.$user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_points_sum').'
'. - 'E: '.$user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_points').' | S: '.$user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_points_shop').''; + ->addColumn('sales_volume_KP_points', function (User $user) { + return '
'.$user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_points_KP_sum').'
'. + 'E: '.$user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_KP_points').' | S: '.$user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_points_shop').''; }) ->addColumn('sales_volume_total', function (User $user) { return '
'.formatNumber($user->getUserSalesVolumeBy($this->month, $this->year, 'sales_volume_total_sum')).' €
'. @@ -335,7 +334,7 @@ class BusinessController extends Controller data-back="" data-modal="modal-xl" data-init_from="admin" - data-route="'.route('modal_load').'">
'; + data-route="'.route('modal_load').'">
'; } $sponsor .= ''.$user->user_sponsor->email; if($user->user_sponsor->account){ @@ -381,7 +380,7 @@ class BusinessController extends Controller ->orderColumn('email', 'email $1') ->orderColumn('last_name', 'last_name $1') ->orderColumn('active_account', 'payment_account $1') - ->rawColumns(['id', 'is_qual_kp', 'sales_volume_points', 'sales_volume_total', 'sponsor', 'active_account']) + ->rawColumns(['id', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total', 'sponsor', 'active_account']) ->make(true); } } \ No newline at end of file diff --git a/app/Http/Controllers/BusinessPointsController.php b/app/Http/Controllers/BusinessPointsController.php index 557f1ef5..4c5932d8 100644 --- a/app/Http/Controllers/BusinessPointsController.php +++ b/app/Http/Controllers/BusinessPointsController.php @@ -131,6 +131,9 @@ class BusinessPointsController extends Controller ->addColumn('status', function (UserSalesVolume $UserSalesVolume) { return ''.$UserSalesVolume->getStatusType().''; }) + ->addColumn('status_points', function (UserSalesVolume $UserSalesVolume) { + return ''.$UserSalesVolume->getStatusPointsType().''; + }) ->addColumn('message', function (UserSalesVolume $UserSalesVolume) { return ''.$UserSalesVolume->message.''; }) @@ -169,7 +172,7 @@ class BusinessPointsController extends Controller ->orderColumn('m_account', 'm_account $1') ->orderColumn('first_name', 'first_name $1') ->orderColumn('last_name', 'last_name $1') - ->rawColumns(['id', 'order', 'status', 'message', 'info', 'total_net']) + ->rawColumns(['id', 'order', 'status', 'status_points', 'message', 'info', 'total_net']) ->make(true); } } \ No newline at end of file diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index de73f453..84df5d26 100755 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -34,6 +34,7 @@ class HomeController extends Controller //login / Dashboard public function show() { + if(!Auth::check()){ return redirect('login'); } diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php index 19876b9d..fbcd2b7e 100644 --- a/app/Http/Controllers/ModalController.php +++ b/app/Http/Controllers/ModalController.php @@ -145,15 +145,16 @@ class ModalController extends Controller private function getForBusinessUserDetail(User $user, $data){ - $auth_user = \Auth::user(); - if($auth_user->isAdmin() || $auth_user->id === $user->id){ + //$auth_user = \Auth::user(); + //if($auth_user->isAdmin() || $auth_user->id === $user->id){ $TreeCalcBot = new TreeCalcBot($data['month'], $data['year'], $data['init_from']); $TreeCalcBot->initBusinesslUserDetail($user); +//TODO is not Admin, read is user in Parent tree ... if(!$TreeCalcBot->business_user){ abort(403, 'no user found'); } return $TreeCalcBot; - } + //} return null; } diff --git a/app/Http/Controllers/PaymentCreditController.php b/app/Http/Controllers/PaymentCreditController.php index 64ecc5ca..fbe933dd 100644 --- a/app/Http/Controllers/PaymentCreditController.php +++ b/app/Http/Controllers/PaymentCreditController.php @@ -23,25 +23,14 @@ use stdClass; class PaymentCreditController extends Controller { - private $startYear; - private $endYear; - private $rangeYears; - private $activeYear; - public function __construct() { $this->middleware('admin'); - $this->startYear = 2022; - $this->endYear = date('Y'); - $this->rangeYears = range($this->startYear, $this->endYear); - $this->activeYear = $this->endYear; - } public function index() { $this->setFilterVars(); - $data = [ 'filter_months' => HTMLHelper::$months, 'filter_years' => HTMLHelper::getYearRange(2022), @@ -59,7 +48,7 @@ class PaymentCreditController extends Controller return back(); } if(!isset($data['credit'])){ - \Session()->flash('alert-error', 'Bitte Betrag eingebe'); + \Session()->flash('alert-error', 'Bitte Betrag eingeben'); return back(); } if(!isset($data['message'])){ @@ -153,17 +142,31 @@ class PaymentCreditController extends Controller return redirect(route('admin_payments_credit')); } + private function initSearch($archive = false, $request = true) + { + + $this->setFilterVars(); + + + $date_start = Carbon::parse('01.'.Request::get('credit_filter_month').'.'.Request::get('credit_filter_year'))->format('Y-m-d'); + $date_end = Carbon::parse('01.'.Request::get('credit_filter_month').'.'.Request::get('credit_filter_year'))->endOfMonth()->format('Y-m-d'); + $query = UserCredit::with('user', 'user.account')->select('user_credits.*') + ->whereBetween('date', [$date_start, $date_end]); + + if(Request::get('credit_filter_name')){ + $query->whereHas('user.account', function ($query) { + return $query->where('first_name', 'LIKE', '%'.Request::get('credit_filter_name').'%')->orWhere('last_name', 'LIKE', '%'.Request::get('credit_filter_name').'%'); + })->get(); + $query->whereHas('user', function ($query) { + return $query->where('email', 'LIKE', '%'.Request::get('credit_filter_name').'%'); + })->get(); + } + return $query; + } + public function datatable(){ - $this->setFilterVars(); - $date1 = Carbon::parse('01.01.'.$this->activeYear)->format('Y-m-d'); - $date2 = Carbon::parse('31.12.'.$this->activeYear)->format('Y-m-d'); - - $query = UserCredit::with('user', 'user.account')->select('user_credits.*') - //::with('shopping_user', )->select('shopping_orders.*') - //->where('paid', '=', 1) - ->whereBetween('date', [$date1, $date2]); - //->orderBy('created_at', 'DESC'); + $query = $this->initSearch(); return \DataTables::eloquent($query) ->addColumn('view', function (UserCredit $UserCredit) { @@ -178,7 +181,7 @@ class PaymentCreditController extends Controller }) ->addColumn('total', function (UserCredit $UserCredit) { - return $UserCredit->getFormattedTotal()." €"; + return ''.$UserCredit->getFormattedTotal()." €"; }) ->addColumn('credits', function (UserCredit $UserCredit) { $ret = ""; @@ -197,7 +200,6 @@ class PaymentCreditController extends Controller '; }) - ->orderColumn('id', 'id $1') ->orderColumn('status', 'status $1') ->orderColumn('total', 'total $1') diff --git a/app/Http/Controllers/PaymentInvoiceController.php b/app/Http/Controllers/PaymentInvoiceController.php index 5d559edc..fe5d90e0 100644 --- a/app/Http/Controllers/PaymentInvoiceController.php +++ b/app/Http/Controllers/PaymentInvoiceController.php @@ -11,10 +11,6 @@ use App\Services\HTMLHelper; class PaymentInvoiceController extends Controller { - private $startYear; - private $endYear; - private $rangeYears; - private $activeYear; public function __construct() { @@ -60,22 +56,17 @@ class PaymentInvoiceController extends Controller ->where('user_invoices.year', '=', Request::get('invoice_filter_year')); if(Request::get('invoice_filter_name')){ - $query->where('shopping_order.shopping_user.billing_firstname', 'LIKE', '%'.Request::get('invoice_filter_name').'%'); - $query->where('shopping_order.shopping_user.billing_lastname', 'LIKE', '%'.Request::get('invoice_filter_name').'%'); - $query->where('shopping_order.shopping_user.billing_email', 'LIKE', '%'.Request::get('invoice_filter_name').'%'); + $query->whereHas('shopping_order.shopping_user', function ($query) { + return $query->where('billing_firstname', 'LIKE', '%'.Request::get('invoice_filter_name').'%')->orWhere('billing_lastname', 'LIKE', '%'.Request::get('invoice_filter_name').'%')->orWhere('billing_email', 'LIKE', '%'.Request::get('invoice_filter_name').'%'); + })->get(); } - - //->orderBy('created_at', 'DESC'); - /* $query = FlexHour::leftJoin("flex_hour_items", function($join) { - $join->on("flex_hour_items.flex_hour_id","=","flex_hours.id"); - $join->where("flex_hour_items.date","=", FlexHourItemBot::$date); - })*/ return $query; } public function datatable(){ $query = $this->initSearch(); + return \DataTables::eloquent($query) ->addColumn('id', function (UserInvoice $UserInvoice) { if($UserInvoice->shopping_order->auth_user_id){ diff --git a/app/Http/Controllers/PaymentPointsController.php b/app/Http/Controllers/PaymentPointsController.php index fe44883d..c5fd60b5 100644 --- a/app/Http/Controllers/PaymentPointsController.php +++ b/app/Http/Controllers/PaymentPointsController.php @@ -23,7 +23,7 @@ class PaymentPointsController extends Controller public function index() { - + dd("function?"); $this->setFilterVars(); $data = [ 'filter_months' => HTMLHelper::$months, diff --git a/app/Http/Controllers/ProductsSalesController.php b/app/Http/Controllers/ProductsSalesController.php new file mode 100644 index 00000000..a966a08b --- /dev/null +++ b/app/Http/Controllers/ProductsSalesController.php @@ -0,0 +1,151 @@ +middleware('admin'); + } + + public function index() + { + + $this->setFilterVars(); + $data = [ + 'filter_months' => HTMLHelper::$months, + 'filter_years' => HTMLHelper::getYearRange(2022), + ]; + return view('admin.product.salesvolume', $data); + } + + public function download(){ + + if(Request::get('action') === "export"){ + $objects = $this->initSearch(false); + $columns = []; + $filename = "mivita-absatzmengen-".session('product_sales_vol_filter_month').'_'.session('product_sales_vol_filter_year')."-export"; + $headers = array( + '#', + 'Produkt', + 'Artikelnummer', + 'Menge', + + ); + if($objects){ + foreach ($objects as $key => $obj){ + $columns[] = array( + 'id' => $key, + 'name' => $obj['name'], + 'number' => $obj['number'], + 'value' => $obj['value'], + ); + } + } + return Excel::download(new UserTeamExport($columns, $headers), $filename.'.xls'); + } + } + + + private function setFilterVars(){ + + if(!session('product_sales_vol_filter_month')){ + session(['product_sales_vol_filter_month' => intval(date('m'))]); + } + if(!session('product_sales_vol_filter_year')){ + session(['product_sales_vol_filter_year' => intval(date('Y'))]); + } + + if(Request::get('product_sales_vol_filter_month')){ + session(['product_sales_vol_filter_month' => Request::get('product_sales_vol_filter_month')]); + } + if(Request::get('product_sales_vol_filter_year')){ + session(['product_sales_vol_filter_year' => Request::get('product_sales_vol_filter_year')]); + } + } + + + private function initSearch($returnColl = true) + { + $this->setFilterVars(); + + $date_start = Carbon::parse('01.'.session('product_sales_vol_filter_month').'.'.session('product_sales_vol_filter_year'))->format('Y-m-d'); + $date_end = Carbon::parse('01.'.session('product_sales_vol_filter_month').'.'.session('product_sales_vol_filter_year'))->endOfMonth()->format('Y-m-d'); + + $ShoppingOrders = ShoppingOrder::where('paid', 1)->where('mode', 'live')->whereBetween('created_at', [$date_start, $date_end])->get(); + + $objects = []; + foreach($ShoppingOrders as $ShoppingOrder){ + foreach($ShoppingOrder->shopping_order_items as $shopping_order_item){ + + if($shopping_order_item->product){ + if(isset($objects[$shopping_order_item->product->id])){ + $value = intval($objects[$shopping_order_item->product->id]['value'] + $shopping_order_item->qty); + $objects[$shopping_order_item->product->id]['value'] = $value; + }else{ + $objects[$shopping_order_item->product->id] = [ + 'name' => $shopping_order_item->product->name, + 'number' => $shopping_order_item->product->number, + 'value' => $shopping_order_item->qty + ]; + } + + } + + } + } + + if($returnColl){ + $collection = collect(); + + foreach($objects as $key => $obj){ + $collection->push([ + 'id' => $key, + 'name' => $obj['name'], + 'number' => $obj['number'], + 'value' => $obj['value'], + ]); + } + return $collection; + } + return $objects; + + + } + + + public function datatable(){ + + $collection = $this->initSearch(true); + + $collect = collect([ + ['id' => 1, 'name' => 'John', 'number'=>92012, 'value'=>123], + ['id' => 2, 'name' => 'Jane', 'number'=>92012, 'value'=>123], + ['id' => 3, 'name' => 'James', 'number'=>92012, 'value'=>123], + ]); + + return \DataTables::of($collection)->toJson(); + + + + } + + + + +} \ No newline at end of file diff --git a/app/Http/Controllers/SalesController.php b/app/Http/Controllers/SalesController.php index 1a4f7764..382ed4ed 100755 --- a/app/Http/Controllers/SalesController.php +++ b/app/Http/Controllers/SalesController.php @@ -38,10 +38,10 @@ class SalesController extends Controller return redirect(route('admin_sales_customers_detail', [$ShoppingOrder->id])); abort(403, 'Kundenbestellung'); } - if($ShoppingOrder->shipped === 0){ + /*if($ShoppingOrder->shipped === 0){ $ShoppingOrder->shipped = 1; $ShoppingOrder->save(); - } + }*/ $data = [ 'shopping_order' => $ShoppingOrder, @@ -149,10 +149,12 @@ class SalesController extends Controller return redirect(route('admin_sales_users_detail', [$ShoppingOrder->id])); abort(403, 'Beraterbestellung'); } + /* if($ShoppingOrder->shipped === 0){ $ShoppingOrder->shipped = 1; $ShoppingOrder->save(); } + */ $data = [ 'shopping_order' => $ShoppingOrder, 'isAdmin' => true, @@ -278,7 +280,7 @@ class SalesController extends Controller return $ShoppingOrder->getLastShoppingPayment('reference'); }) ->addColumn('member_id', function (ShoppingOrder $ShoppingOrder) { - if($ShoppingOrder->member_id) { + if($ShoppingOrder->member_id && $ShoppingOrder->member) { return $ShoppingOrder->member ? '' . $ShoppingOrder->member->getFullName() . '' : 'gelöscht'; } if($ShoppingOrder->shopping_user && $ShoppingOrder->shopping_user->is_like){ diff --git a/app/Http/Controllers/SyS/SysController.php b/app/Http/Controllers/SyS/SysController.php index db668d3d..d99745d9 100644 --- a/app/Http/Controllers/SyS/SysController.php +++ b/app/Http/Controllers/SyS/SysController.php @@ -14,6 +14,7 @@ use App\Http\Controllers\Controller; use App\Services\SyS\ShoppingOrders; use App\Services\SyS\BuyingsProducts; use App\Services\SyS\BusinessStructur; +use App\Services\SyS\ChangeUserBusinesses; class SysController extends Controller { @@ -62,6 +63,10 @@ class SysController extends Controller case 'corrections': return Correction::show(); break; + case 'change_user_businesses': + return ChangeUserBusinesses::show(); + break; + } abort(403, 'not found tool'); } @@ -96,6 +101,9 @@ class SysController extends Controller case 'corrections': return Correction::store(); break; + case 'change_user_businesses': + return ChangeUserBusinesses::store(); + break; } abort(403, 'not found tool'); } diff --git a/app/Http/Controllers/User/CustomerController.php b/app/Http/Controllers/User/CustomerController.php index 83714105..d5c279c7 100755 --- a/app/Http/Controllers/User/CustomerController.php +++ b/app/Http/Controllers/User/CustomerController.php @@ -189,7 +189,6 @@ class CustomerController extends Controller return back()->withErrors($validator)->withInput(Request::all()); } } - $data['faker_mail'] = isset($data['faker_mail']) ? true : false; $data['has_buyed'] = isset($data['has_buyed']) ? true : false; $data['subscribed'] = isset($data['subscribed']) ? true : false; diff --git a/app/Http/Controllers/User/TeamController.php b/app/Http/Controllers/User/TeamController.php index 49f0886b..be68a7b3 100755 --- a/app/Http/Controllers/User/TeamController.php +++ b/app/Http/Controllers/User/TeamController.php @@ -2,13 +2,16 @@ namespace App\Http\Controllers\User; +use Auth; use Request; use App\User; use App\Services\HTMLHelper; +use App\Exports\UserTeamExport; use App\Models\UserSalesVolume; use App\Http\Controllers\Controller; +use Maatwebsite\Excel\Facades\Excel; +use App\Services\BusinessPlan\ExportBot; use App\Services\BusinessPlan\TreeCalcBot; -use Auth; class TeamController extends Controller { @@ -49,7 +52,6 @@ class TeamController extends Controller return view('user.team.structure', $data); } - public function points() { $this->setFilterVars(); @@ -63,6 +65,69 @@ class TeamController extends Controller return view('user.team.points', $data); } + public function export() + { + + $user = User::find(\Auth::user()->id); + $ExportBot = new ExportBot('member'); + $ExportBot->initStructureUser($user, 'list'); //tree or list + $data = [ + 'ExportBot' => $ExportBot, + ]; + return view('user.team.export', $data); + } + + public function userTeamExport(){ + + if(Request::get('action') === "export"){ + $user = User::find(\Auth::user()->id); + $ExportBot = new ExportBot('member'); + $ExportBot->initStructureUser($user, 'list'); //tree or list + $columns = []; + $filename = "mivita-mein-team-export-".date('Y-m-d-H-i-s'); + $headers = array( + 'Line', + 'Level', + 'E-Mail', + 'Vorname', + 'Nachname', + 'Adresse', + 'Zusatz', + 'PLZ', + 'Ort', + 'Land', + 'Tel', + 'Mobil', + 'Geburtstag', + 'Account', + 'Account bis', + 'Sponsor', + ); + if(isset($ExportBot->user_list->childs)){ + foreach ($ExportBot->user_list->childs as $child){ + $columns[] = array( + 'Line' => $child->line, + 'Level' => $child->level_name, + 'E-Mail' => $child->email, + 'Vorname' => $child->first_name, + 'Nachname' => $child->last_name, + 'Adresse' => $child->address, + 'Zusatz' => $child->address_2, + 'PLZ' => $child->zipcode, + 'Ort' => $child->city, + 'Land' => $child->country_id, + 'Tel' => $child->phone, + 'Mobil' => $child->mobil, + 'Geburtstag' => $child->birthday, + 'Account' => ($child->active_account == 1 ? 'JA' : 'NEIN'), + 'Account bis' => $child->payment_account_date, + 'Sponsor' => $child->sponsor_name, + ); + } + } + return Excel::download(new UserTeamExport($columns, $headers), $filename.'.xls'); + } + } private function setFilterVars(){ @@ -72,7 +137,6 @@ class TeamController extends Controller if(!session('team_user_filter_year')){ session(['team_user_filter_year' => intval(date('Y'))]); } - if(!session('team_user_points_filter_month')){ session(['team_user_points_filter_month' => intval(date('m'))]); } diff --git a/app/Http/Controllers/UserLevelController.php b/app/Http/Controllers/UserLevelController.php index ad7ced52..68d6f3e8 100755 --- a/app/Http/Controllers/UserLevelController.php +++ b/app/Http/Controllers/UserLevelController.php @@ -38,7 +38,12 @@ class UserLevelController extends Controller $value->save(); } } - + //set paylines //pr_line_1 + for ($i=1; $i <=8; $i++) { + if(isset($data['pr_line_'.$i])){ + $data['paylines'] = $i; + } + } if($data['id'] == "new"){ $model = UserLevel::create($data); }else{ @@ -47,23 +52,8 @@ class UserLevelController extends Controller $model->save(); } - /*if(!empty($data['trans'])){ - $trans = []; - foreach ($data['trans'] as $lang => $value){ - if($value && $value != null){ - $trans[$lang] = $value; - } - } - if(count($trans)){ - $model->trans_name = $trans; - $model->save(); - } - }*/ - \Session()->flash('alert-save', '1'); return redirect(route('admin_levels')); - - } diff --git a/app/Http/Controllers/Web/CardController.php b/app/Http/Controllers/Web/CardController.php index e8d9e90a..e2d35a4d 100755 --- a/app/Http/Controllers/Web/CardController.php +++ b/app/Http/Controllers/Web/CardController.php @@ -150,12 +150,13 @@ class CardController extends Controller public function deleteCard(){ - Yard::instance('shopping')->destroy(); - return back(); + $setCode = Shop::getUserShopLang(); + $mylangs = Shop::getLangChange(); + foreach($mylangs as $code => $country){ + if(strtolower($setCode) === strtolower($code)){ + Shop::initUserShopLang($country); + return back(); + } + } } - - - - - } \ No newline at end of file diff --git a/app/Http/Controllers/Web/CheckoutController.php b/app/Http/Controllers/Web/CheckoutController.php index faaae8fc..432c1304 100755 --- a/app/Http/Controllers/Web/CheckoutController.php +++ b/app/Http/Controllers/Web/CheckoutController.php @@ -283,7 +283,7 @@ class CheckoutController extends Controller $shopping_order = $this->makeShoppingOrder($shopping_user); //CustomerPriority if($shopping_user->is_from === 'shopping'){ - CustomerPriority::checkOne(ShoppingUser::find($shopping_user->id), true); + $ret = CustomerPriority::checkOne(ShoppingUser::find($shopping_user->id), true); } Util::setUserHistoryValue(['status'=>2, 'shopping_order_id'=>$shopping_order->id]); @@ -402,6 +402,8 @@ class CheckoutController extends Controller Yard::instance('shopping')->destroy(); $this->destroy(); + + $payt = $ShoppingPayment->payment_transactions->last(); $data = [ @@ -678,6 +680,7 @@ class CheckoutController extends Controller { $this->session->remove($this->instance); } + //is for Rechnung MIV private function directPaymentStatus(PaymentTransaction $payt){ diff --git a/app/Http/Controllers/Web/SiteController.php b/app/Http/Controllers/Web/SiteController.php index 1b4b709c..084f1436 100755 --- a/app/Http/Controllers/Web/SiteController.php +++ b/app/Http/Controllers/Web/SiteController.php @@ -79,8 +79,6 @@ class SiteController extends Controller $headline_image = $category->iq_image; } - - $product_categories = ProductCategory::where('category_id', $category->id)->whereHas('product', function ($query) use ($category) { $query->where('active', true)->whereJsonContains('show_on', '1'); })->orderBy('pos', 'DESC')->get(); diff --git a/app/Mail/MailCredit.php b/app/Mail/MailCredit.php index 75083473..33507146 100644 --- a/app/Mail/MailCredit.php +++ b/app/Mail/MailCredit.php @@ -29,9 +29,12 @@ class MailCredit extends Mailable public function build() { - $title = __('email.credit_title'); + $title = 'Hallo '; $copy1line = __('email.credit_copy1line'); + if(isset($this->user_credit->user->account)){ + $title .= $this->user_credit->user->account->m_first_name.","; + } $filename = $this->user_credit->filename; $disk = $this->user_credit->disk; $path = $this->user_credit->getDownloadPath(); diff --git a/app/Models/Attribute.php b/app/Models/Attribute.php index 9237561f..d1a4455b 100644 --- a/app/Models/Attribute.php +++ b/app/Models/Attribute.php @@ -25,13 +25,13 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute wherePos($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute whereTransName($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute whereUpdatedAt($value) - * @mixin \Eloquent * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute whereSlug($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Attribute query() * @property-read int|null $childrens_count + * @mixin \Eloquent */ class Attribute extends Model { diff --git a/app/Models/Category.php b/app/Models/Category.php index 41daa429..a1d15ce4 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -26,7 +26,6 @@ use Cviebrock\EloquentSluggable\Sluggable; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category wherePos($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category whereTransName($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category whereUpdatedAt($value) - * @mixin \Eloquent * @property string|null $slug * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProductCategory[] $product_categories * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Category findSimilarSlugs($attribute, $config, $slug) @@ -46,6 +45,7 @@ use Cviebrock\EloquentSluggable\Sluggable; * @property-read \App\Models\IqImage|null $iq_image * @property-read int|null $product_categories_count * @method static \Illuminate\Database\Eloquent\Builder|Category withUniqueSlugConstraints(\Illuminate\Database\Eloquent\Model $model, string $attribute, array $config, string $slug) + * @mixin \Eloquent */ class Category extends Model { diff --git a/app/Models/Country.php b/app/Models/Country.php index cbbcb6e2..aaeb5249 100644 --- a/app/Models/Country.php +++ b/app/Models/Country.php @@ -26,7 +26,6 @@ use PHPUnit\Framework\Constraint\Count; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereIt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country wherePhone($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country whereRu($value) - * @mixin \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Country query() @@ -61,6 +60,7 @@ use PHPUnit\Framework\Constraint\Count; * @property bool|null $supply_country * @method static \Illuminate\Database\Eloquent\Builder|Country whereEuCountry($value) * @method static \Illuminate\Database\Eloquent\Builder|Country whereSupplyCountry($value) + * @mixin \Eloquent */ class Country extends Model { diff --git a/app/Models/CountryPrice.php b/app/Models/CountryPrice.php index 1354071f..8439d7d3 100644 --- a/app/Models/CountryPrice.php +++ b/app/Models/CountryPrice.php @@ -36,8 +36,8 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereUpdatedAt($value) - * @mixin \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\CountryPrice whereCCurrency($value) + * @mixin \Eloquent */ class CountryPrice extends Model { diff --git a/app/Models/Homeparty.php b/app/Models/Homeparty.php index 0992efbe..2c7d3bd4 100644 --- a/app/Models/Homeparty.php +++ b/app/Models/Homeparty.php @@ -52,7 +52,6 @@ use Illuminate\Database\Eloquent\Collection; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Homeparty wherePos($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Homeparty whereStatus($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Homeparty whereUpdatedAt($value) - * @mixin \Eloquent * @property string|null $token * @property bool|null $token_active * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\HomepartyUser[] $homeparty_guests @@ -72,6 +71,7 @@ use Illuminate\Database\Eloquent\Collection; * @method static \Illuminate\Database\Eloquent\Builder|Homeparty whereOrder($value) * @method static \Illuminate\Database\Eloquent\Builder|Homeparty whereSettings($value) * @method static \Illuminate\Database\Eloquent\Builder|Homeparty whereStep($value) + * @mixin \Eloquent */ class Homeparty extends Model { diff --git a/app/Models/HomepartyUser.php b/app/Models/HomepartyUser.php index 5a3e4656..1ce35ac7 100644 --- a/app/Models/HomepartyUser.php +++ b/app/Models/HomepartyUser.php @@ -102,13 +102,13 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\HomepartyUser whereUserDeletedAt($value) * @method static \Illuminate\Database\Query\Builder|\App\Models\HomepartyUser withTrashed() * @method static \Illuminate\Database\Query\Builder|\App\Models\HomepartyUser withoutTrashed() - * @mixin \Eloquent * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\HomepartyUserOrderItem[] $homeparty_user_order_items * @property-read int|null $homeparty_user_order_items_count * @property string|null $delivery * @property array|null $settings * @method static \Illuminate\Database\Eloquent\Builder|HomepartyUser whereDelivery($value) * @method static \Illuminate\Database\Eloquent\Builder|HomepartyUser whereSettings($value) + * @mixin \Eloquent */ class HomepartyUser extends Model { diff --git a/app/Models/HomepartyUserOrderItem.php b/app/Models/HomepartyUserOrderItem.php index 238a721e..f6776b59 100644 --- a/app/Models/HomepartyUserOrderItem.php +++ b/app/Models/HomepartyUserOrderItem.php @@ -47,9 +47,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\HomepartyUserOrderItem whereSlug($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\HomepartyUserOrderItem whereTaxRate($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\HomepartyUserOrderItem whereUpdatedAt($value) - * @mixin \Eloquent * @property float|null $ek_price_net * @method static \Illuminate\Database\Eloquent\Builder|HomepartyUserOrderItem whereEkPriceNet($value) + * @mixin \Eloquent */ class HomepartyUserOrderItem extends Model { diff --git a/app/Models/IqImage.php b/app/Models/IqImage.php index ab1f097b..8e3eca89 100644 --- a/app/Models/IqImage.php +++ b/app/Models/IqImage.php @@ -29,7 +29,6 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereSize($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereUpdatedAt($value) - * @mixin \Eloquent * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereSlug($value) @@ -39,6 +38,7 @@ use Illuminate\Database\Eloquent\Model; * @property int|null $pos * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\IqImage wherePos($value) * @method static \Illuminate\Database\Eloquent\Builder|IqImage withUniqueSlugConstraints(\Illuminate\Database\Eloquent\Model $model, string $attribute, array $config, string $slug) + * @mixin \Eloquent */ class IqImage extends Model { diff --git a/app/Models/PaymentMethod.php b/app/Models/PaymentMethod.php index b8a9b882..9880cd3d 100644 --- a/app/Models/PaymentMethod.php +++ b/app/Models/PaymentMethod.php @@ -34,9 +34,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentMethod whereShort($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentMethod whereShowAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentMethod whereUpdatedAt($value) - * @mixin \Eloquent * @property array|null $show_on * @method static \Illuminate\Database\Eloquent\Builder|PaymentMethod whereShowOn($value) + * @mixin \Eloquent */ class PaymentMethod extends Model { diff --git a/app/Models/PaymentTransaction.php b/app/Models/PaymentTransaction.php index e0a0f872..67073ed6 100644 --- a/app/Models/PaymentTransaction.php +++ b/app/Models/PaymentTransaction.php @@ -39,9 +39,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereTxid($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereUserid($value) - * @mixin \Eloquent * @property string|null $mode * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\PaymentTransaction whereMode($value) + * @mixin \Eloquent */ class PaymentTransaction extends Model { diff --git a/app/Models/Product.php b/app/Models/Product.php index 06f2eb61..01b39e44 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -71,7 +71,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereUsage($value) * @method static \Illuminate\Database\Query\Builder|\App\Models\Product withTrashed() * @method static \Illuminate\Database\Query\Builder|\App\Models\Product withoutTrashed() - * @mixin \Eloquent * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Product whereSlug($value) @@ -123,6 +122,10 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|Product whereBuyingRestriction($value) * @method static \Illuminate\Database\Eloquent\Builder|Product whereBuyingRestrictionAmount($value) * @method static \Illuminate\Database\Eloquent\Builder|Product whereNoFreeShipping($value) + * @property-read \Illuminate\Database\Eloquent\Collection $product_buyings + * @property-read int|null $product_buyings_count + * @property-read \Illuminate\Database\Eloquent\Collection $product_buyings + * @mixin \Eloquent */ class Product extends Model { @@ -152,6 +155,10 @@ class Product extends Model 'no_free_shipping' => 'bool', 'buying_restriction' => 'bool', 'buying_restriction_amount' => 'int', + 'sponsor_buying_points' => 'bool', + 'sponsor_buying_points_amount' => 'int', + + ]; use Sluggable; @@ -189,6 +196,8 @@ class Product extends Model 'shipping_addon', 'buying_restriction', 'buying_restriction_amount', + 'sponsor_buying_points', + 'sponsor_buying_points_amount', 'identifier', 'action', 'upgrade_to_id' diff --git a/app/Models/ProductAttribute.php b/app/Models/ProductAttribute.php index a94b36cf..03300ac3 100644 --- a/app/Models/ProductAttribute.php +++ b/app/Models/ProductAttribute.php @@ -19,10 +19,10 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute whereUpdatedAt($value) - * @mixin \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductAttribute query() + * @mixin \Eloquent */ class ProductAttribute extends Model { diff --git a/app/Models/ProductCategory.php b/app/Models/ProductCategory.php index 61b4a998..81fad39c 100644 --- a/app/Models/ProductCategory.php +++ b/app/Models/ProductCategory.php @@ -19,12 +19,12 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory whereUpdatedAt($value) - * @mixin \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductCategory query() * @property int|null $pos * @method static \Illuminate\Database\Eloquent\Builder|ProductCategory wherePos($value) + * @mixin \Eloquent */ class ProductCategory extends Model { diff --git a/app/Models/ProductImage.php b/app/Models/ProductImage.php index 4ef5bc32..85ef7804 100644 --- a/app/Models/ProductImage.php +++ b/app/Models/ProductImage.php @@ -29,7 +29,6 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereSize($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereUpdatedAt($value) - * @mixin \Eloquent * @property string|null $slug * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage findSimilarSlugs($attribute, $config, $slug) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage whereSlug($value) @@ -39,6 +38,7 @@ use Illuminate\Database\Eloquent\Model; * @property int|null $pos * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ProductImage wherePos($value) * @method static \Illuminate\Database\Eloquent\Builder|ProductImage withUniqueSlugConstraints(\Illuminate\Database\Eloquent\Model $model, string $attribute, array $config, string $slug) + * @mixin \Eloquent */ class ProductImage extends Model { diff --git a/app/Models/Shipping.php b/app/Models/Shipping.php index 7a3af409..6ae8f9ca 100644 --- a/app/Models/Shipping.php +++ b/app/Models/Shipping.php @@ -28,9 +28,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Shipping whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Shipping whereTransName($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Shipping whereUpdatedAt($value) - * @mixin \Eloquent * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShippingPrice[] $shipping_prices * @property-read int|null $shipping_prices_count + * @mixin \Eloquent */ class Shipping extends Model { diff --git a/app/Models/ShippingCountry.php b/app/Models/ShippingCountry.php index 7476d05a..f2e3b2d0 100644 --- a/app/Models/ShippingCountry.php +++ b/app/Models/ShippingCountry.php @@ -23,9 +23,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingCountry whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingCountry whereShippingId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingCountry whereUpdatedAt($value) - * @mixin \Eloquent * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $shopping_orders * @property-read int|null $shopping_orders_count + * @mixin \Eloquent */ class ShippingCountry extends Model { diff --git a/app/Models/ShippingPrice.php b/app/Models/ShippingPrice.php index 4220e187..04bc335d 100644 --- a/app/Models/ShippingPrice.php +++ b/app/Models/ShippingPrice.php @@ -34,13 +34,13 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingPrice whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingPrice whereWeightFrom($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingPrice whereWeightTo($value) - * @mixin \Eloquent * @property-write mixed $tax * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingPrice whereTaxRate($value) * @property float|null $price_comp * @property int|null $num_comp * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingPrice whereNumComp($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShippingPrice wherePriceComp($value) + * @mixin \Eloquent */ class ShippingPrice extends Model { diff --git a/app/Models/ShoppingCollectOrder.php b/app/Models/ShoppingCollectOrder.php index 75c00170..f544c144 100644 --- a/app/Models/ShoppingCollectOrder.php +++ b/app/Models/ShoppingCollectOrder.php @@ -54,6 +54,8 @@ use App\User; * @method static \Illuminate\Database\Eloquent\Builder|ShoppingCollectOrder whereTaxTotal($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingCollectOrder whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingCollectOrder whereUserId($value) + * @property array|null $net_split + * @method static \Illuminate\Database\Eloquent\Builder|ShoppingCollectOrder whereNetSplit($value) * @mixin \Eloquent */ class ShoppingCollectOrder extends Model @@ -73,6 +75,7 @@ class ShoppingCollectOrder extends Model 'points' => 'int', 'status' => 'int', 'tax_split' => 'array', + 'net_split' => 'array', 'orders' => AsArrayObject::class, 'shop_items' => AsArrayObject::class, ]; @@ -90,6 +93,7 @@ class ShoppingCollectOrder extends Model 'qty_total', 'points', 'tax_split', + 'net_split', 'orders', 'shop_items', 'status' @@ -115,11 +119,31 @@ class ShoppingCollectOrder extends Model { $tax_split = $this->tax_split; $tax_split[$tax_rate] = isset($tax_split[$tax_rate]) ? round($tax_split[$tax_rate] += $add_tax, 2) : round($add_tax, 2); + + foreach($tax_split as $key=>$value){ + $tax_split[$key] = number_format($value, 2); + } $this->tax_split = $tax_split; } + public function addNetToSplit($tax_rate, $add_net) + { + $net_split = $this->net_split; + $net_split[$tax_rate] = isset($net_split[$tax_rate]) ? round($net_split[$tax_rate] += $add_net, 2) : round($add_net, 2); + + foreach($net_split as $key=>$value){ + $net_split[$key] = number_format($value, 2); + } + $this->net_split = $net_split; + } + public function addShopItem($shop_item_id, $shop_item) { + $shop_item->user_price_net = number_format($shop_item->user_price_net, 2); + $shop_item->user_price_total_net = number_format($shop_item->user_price_total_net, 2); + $shop_item->user_tax = number_format($shop_item->user_tax, 2); + $shop_item->user_tax_total = number_format($shop_item->user_tax_total, 2); + $this->shop_items[$shop_item_id] = $shop_item; } diff --git a/app/Models/ShoppingInstance.php b/app/Models/ShoppingInstance.php index be16859a..5a733e72 100644 --- a/app/Models/ShoppingInstance.php +++ b/app/Models/ShoppingInstance.php @@ -27,13 +27,13 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereSubdomain($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereUserShopId($value) - * @mixin \Eloquent * @property int|null $payment * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance wherePayment($value) * @property array|null $shopping_data * @property string|null $back * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereBack($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingInstance whereShoppingData($value) + * @mixin \Eloquent */ class ShoppingInstance extends Model { diff --git a/app/Models/ShoppingOrder.php b/app/Models/ShoppingOrder.php index edbd8958..a2df7908 100644 --- a/app/Models/ShoppingOrder.php +++ b/app/Models/ShoppingOrder.php @@ -51,7 +51,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereUserShopId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder whereWeight($value) - * @mixin \Eloquent * @property int|null $payment_for * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrder wherePaymentFor($value) * @property int|null $member_id @@ -94,6 +93,9 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereApiNotice($value) * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereApiStatus($value) * @property-read \App\Models\ShoppingCollectOrder|null $shopping_collect_order + * @property array|null $net_split + * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereNetSplit($value) + * @mixin \Eloquent */ class ShoppingOrder extends Model { @@ -117,6 +119,7 @@ class ShoppingOrder extends Model 'subtotal_ws', 'tax', 'tax_split', + 'net_split', 'total_shipping', 'points', 'weight', @@ -133,6 +136,8 @@ class ShoppingOrder extends Model protected $casts = [ 'api_notice' => 'array', 'tax_split' => 'array', + 'net_split' => 'array', + ]; public static $shippedTypes = [ @@ -419,107 +424,158 @@ class ShoppingOrder extends Model public function makeHomepartyTaxSplit() { $tax_split = []; + $net_split = []; + if($this->homeparty){ foreach($this->homeparty->homeparty_order_items as $item){ $tax_rate = intval($item->tax_rate); if($tax_rate > 0){ $vk_tax = round((($item->price - $item->price_net) * $item->qty), 2); $ek_tax = round((($item->ek_price - $item->ek_price_net) * $item->qty), 2); + $vk_net = round(($item->price_net * $item->qty), 2); + $ek_net = round(($item->ek_price_net * $item->qty), 2); if(isset($tax_split[$tax_rate])){ $tax_split[$tax_rate]['vk_tax'] = round($tax_split[$tax_rate]['vk_tax'] + $vk_tax, 2); $tax_split[$tax_rate]['ek_tax'] = round($tax_split[$tax_rate]['ek_tax'] + $ek_tax, 2); + + $net_split[$tax_rate]['vk_net'] = round($net_split[$tax_rate]['vk_net'] + $vk_net, 2); + $net_split[$tax_rate]['ek_net'] = round($net_split[$tax_rate]['ek_net'] + $ek_net, 2); }else{ $tax_split[$tax_rate] = ['vk_tax' => $vk_tax, 'ek_tax' => $ek_tax]; + $net_split[$tax_rate] = ['vk_net' => $vk_net, 'ek_net' => $ek_net]; } } } $order_vk_tax = 0; $order_ek_tax = 0; + $order_vk_net = 0; + $order_ek_net = 0; + if($this->homeparty->order){ if(isset($this->homeparty->order['ek_price_net'])){ $order_vk_tax = round((($this->homeparty->order['price'] - $this->homeparty->order['price_net'])), 2); $order_ek_tax = round((($this->homeparty->order['ek_price'] - $this->homeparty->order['ek_price_net'])), 2); + $order_vk_net = $this->homeparty->order['price_net']; + $order_ek_net = $this->homeparty->order['ek_price_net']; } } - if(isset($tax_split[16])){ $tax_split[16] = ['vk_tax' => $order_vk_tax, 'ek_tax' => $order_ek_tax]; + $net_split[16] = ['vk_net' => $order_vk_net, 'ek_net' => $order_ek_net]; } if(isset($tax_split[19])){ $tax_split[19] = ['vk_tax' => $order_vk_tax, 'ek_tax' => $order_ek_tax]; + $net_split[19] = ['vk_net' => $order_vk_net, 'ek_net' => $order_ek_net]; } if(isset($tax_split[5])){ if(!isset($tax_split[16])){ $tax_split[16] = ['vk_tax' => $order_vk_tax, 'ek_tax' => $order_ek_tax]; + $net_split[16] = ['vk_net' => $order_vk_net, 'ek_net' => $order_ek_net]; } $tax_split[16]['vk_tax'] = round($tax_split[16]['vk_tax'] - $tax_split[5]['vk_tax'], 2); $tax_split[16]['ek_tax'] = round($tax_split[16]['ek_tax'] - $tax_split[5]['ek_tax'], 2); + $net_split[16]['vk_net'] = round($net_split[16]['vk_net'] - $net_split[5]['vk_net'], 2); + $net_split[16]['ek_net'] = round($net_split[16]['ek_net'] - $net_split[5]['ek_net'], 2); } if(isset($tax_split[7])){ if(!isset($tax_split[19])){ $tax_split[19] = ['vk_tax' => $order_vk_tax, 'ek_tax' => $order_ek_tax]; + $net_split[19] = ['vk_net' => $order_vk_net, 'ek_net' => $order_ek_net]; } $tax_split[19]['vk_tax'] = round($tax_split[19]['vk_tax'] - $tax_split[7]['vk_tax'], 2); $tax_split[19]['ek_tax'] = round($tax_split[19]['ek_tax'] - $tax_split[7]['ek_tax'], 2); + $net_split[19]['vk_net'] = round($net_split[19]['vk_net'] - $net_split[7]['vk_net'], 2); + $net_split[19]['ek_net'] = round($net_split[19]['ek_net'] - $net_split[7]['ek_net'], 2); } foreach($tax_split as $key=>$value){ $tax_split[$key]['vk_tax'] = number_format($value['vk_tax'], 2); $tax_split[$key]['ek_tax'] = number_format($value['ek_tax'], 2); + } + foreach($net_split as $key=>$value){ + $net_split[$key]['vk_net'] = number_format($value['vk_net'], 2); + $net_split[$key]['ek_net'] = number_format($value['ek_net'], 2); } } if(!isset($tax_split[16]) && !isset($tax_split[19])){ $tax_split = NULL; - } + } + if(!isset($net_split[16]) && !isset($net_split[19])){ + $net_split = NULL; + } + + $this->tax_split = $tax_split; + $this->net_split = $net_split; $this->save(); } public function makeTaxSplit() { $tax_split = NULL; + $net_split = NULL; if($this->tax > 0){ $tax_split = []; + $net_split = []; + foreach($this->shopping_order_items as $item){ $tax_rate = intval($item->tax_rate); if($tax_rate > 0){ - $tax_split[$tax_rate] = isset($tax_split[$tax_rate]) ? + $tax_split[$tax_rate] = isset($tax_split[$tax_rate]) ? round($tax_split[$tax_rate] + ($item->tax * $item->qty), 2) : round(($item->tax * $item->qty), 2); + + $net_split[$tax_rate] = isset($net_split[$tax_rate]) ? + round($net_split[$tax_rate] + ($item->price_net * $item->qty), 2) : + round(($item->price_net * $item->qty), 2); + } } if(isset($tax_split[16])){ $tax_split[16] = $this->tax; + $net_split[16] = $this->subtotal_ws; + } if(isset($tax_split[19])){ $tax_split[19] = $this->tax; + $net_split[19] = $this->subtotal_ws; } if(isset($tax_split[5])){ if(!isset($tax_split[16])){ $tax_split[16] = $this->tax; + $net_split[16] = $this->subtotal_ws; + } $tax_split[16] = round($tax_split[16] - $tax_split[5], 2); + $net_split[16] = round($net_split[16] - $net_split[5], 2); } if(isset($tax_split[7])){ if(!isset($tax_split[19])){ $tax_split[19] = $this->tax; + $net_split[19] = $this->subtotal_ws; + } $tax_split[19] = round($tax_split[19] - $tax_split[7], 2); - + $net_split[19] = round($net_split[19] - $net_split[7], 2); } foreach($tax_split as $key=>$value){ $tax_split[$key] = number_format($value, 2); } + foreach($net_split as $key=>$value){ + $net_split[$key] = number_format($value, 2); + } } $this->tax_split = $tax_split; + $this->net_split = $net_split; + $this->save(); } diff --git a/app/Models/ShoppingOrderItem.php b/app/Models/ShoppingOrderItem.php index 173e7f3b..9173bd71 100644 --- a/app/Models/ShoppingOrderItem.php +++ b/app/Models/ShoppingOrderItem.php @@ -31,7 +31,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereShoppingOrderId($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereSlug($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingOrderItem whereUpdatedAt($value) - * @mixin \Eloquent * @property float|null $tax_rate * @property \Illuminate\Support\Carbon|null $deleted_at * @property string|null $user_deleted_at @@ -58,6 +57,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrderItem whereTax($value) * @property int|null $shopping_collect_order_id * @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrderItem whereShoppingCollectOrderId($value) + * @mixin \Eloquent */ class ShoppingOrderItem extends Model { diff --git a/app/Models/ShoppingPayment.php b/app/Models/ShoppingPayment.php index 5613dfd9..84cb241f 100644 --- a/app/Models/ShoppingPayment.php +++ b/app/Models/ShoppingPayment.php @@ -38,9 +38,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereTxaction($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereWallettype($value) - * @mixin \Eloquent * @property string|null $mode * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingPayment whereMode($value) + * @mixin \Eloquent */ class ShoppingPayment extends Model { diff --git a/app/Models/ShoppingUser.php b/app/Models/ShoppingUser.php index 7693a0f5..426cc473 100644 --- a/app/Models/ShoppingUser.php +++ b/app/Models/ShoppingUser.php @@ -69,7 +69,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereShippingSalutation($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereShippingZipcode($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereUpdatedAt($value) - * @mixin \Eloquent * @property int|null $orders * @property-read \App\Models\ShoppingOrder $shopping_order * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ShoppingOrder[] $shopping_orders @@ -117,6 +116,9 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|ShoppingUser whereHomepartyId($value) * @property int|null $shopping_collect_order_id * @method static \Illuminate\Database\Eloquent\Builder|ShoppingUser whereShoppingCollectOrderId($value) + * @property string|null $remarks + * @method static \Illuminate\Database\Eloquent\Builder|ShoppingUser whereRemarks($value) + * @mixin \Eloquent */ class ShoppingUser extends Model { @@ -160,6 +162,7 @@ class ShoppingUser extends Model 'has_buyed', 'subscribed', 'notice', + 'remarks', 'mode', 'is_for', 'is_from', diff --git a/app/Models/SySetting.php b/app/Models/SySetting.php index 114709a7..bab55fa0 100644 --- a/app/Models/SySetting.php +++ b/app/Models/SySetting.php @@ -36,8 +36,8 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\SySetting whereSlug($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\SySetting whereStatus($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\SySetting whereUpdatedAt($value) - * @mixin \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|SySetting withUniqueSlugConstraints(\Illuminate\Database\Eloquent\Model $model, string $attribute, array $config, string $slug) + * @mixin \Eloquent */ class SySetting extends Model { diff --git a/app/Models/UserAccount.php b/app/Models/UserAccount.php index 0fbe2c46..79af9cb6 100644 --- a/app/Models/UserAccount.php +++ b/app/Models/UserAccount.php @@ -26,7 +26,6 @@ use Carbon\Carbon; * @method static bool|null restore() * @method static \Illuminate\Database\Query\Builder|\App\Models\UserAccount withTrashed() * @method static \Illuminate\Database\Query\Builder|\App\Models\UserAccount withoutTrashed() - * @mixin \Eloquent * @property int $id * @property string|null $salutation * @property string|null $first_name @@ -131,6 +130,7 @@ use Carbon\Carbon; * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankBic($value) * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankIban($value) * @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankOwner($value) + * @mixin \Eloquent */ class UserAccount extends Model { diff --git a/app/Models/UserBusiness.php b/app/Models/UserBusiness.php index 24572d39..fb86d49d 100644 --- a/app/Models/UserBusiness.php +++ b/app/Models/UserBusiness.php @@ -40,12 +40,12 @@ use Illuminate\Database\Eloquent\Casts\AsArrayObject; * @property int|null $margin * @property int|null $margin_shop * @property int|null $qual_kp - * @property int|null $qual_tp - * @property int|null $total_tp - * @property int|null $total_qual_tp + * @property int|null $qual_pp + * @property int|null $total_pp + * @property int|null $total_qual_pp * @property string|null $commission_lines_total * @property float|null $commission_shop_sales - * @property float|null $commission_team_total + * @property float|null $commission_pp_total * @property mixed|null $business_lines * @property mixed|null $user_items * @property array|null $qual_user_level @@ -92,9 +92,13 @@ use Illuminate\Database\Eloquent\Casts\AsArrayObject; * @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereUserItems($value) * @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereUserLevelName($value) * @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereYear($value) - * @mixin \Eloquent * @property array|null $next_qual_user_level * @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereNextQualUserLevel($value) + * @property-read User $user + * @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereQualPp($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereTotalPp($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereTotalQualPp($value) + * @mixin \Eloquent */ class UserBusiness extends Model { @@ -108,25 +112,33 @@ class UserBusiness extends Model 'm_level_id' => 'int', 'active_account' => 'bool', 'm_account' => 'int', - 'sales_volume_points' => 'int', + 'sales_volume_KP_points' => 'int', + 'sales_volume_TP_points' => 'int', 'sales_volume_points_shop' => 'int', - 'sales_volume_points_sum' => 'int', + 'sales_volume_points_KP_sum' => 'int', + 'sales_volume_points_TP_sum' => 'int', 'sales_volume_total' => 'float', 'sales_volume_total_shop' => 'float', 'sales_volume_total_sum' => 'float', + 'payline_points' => 'int', + 'payline_points_qual_kp' => 'int', 'margin' => 'float', 'margin_shop' => 'float', 'qual_kp' => 'int', - 'qual_tp' => 'int', - 'total_tp' => 'int', - 'total_qual_tp' => 'int', - 'commission_team_total' => 'float', + 'qual_pp' => 'int', + 'total_pp' => 'int', + 'total_qual_pp' => 'int', + 'commission_pp_total' => 'float', + 'commission_growth_total' => 'float', 'commission_shop_sales' => 'float', 'qual_user_level' => 'array', + 'qual_user_level_next' => 'array', 'next_qual_user_level' => 'array', + 'next_can_user_level' => 'array', 'sponsor' => 'object', 'business_lines' => AsArrayObject::class, - 'user_items' => AsArrayObject::class + 'user_items' => AsArrayObject::class, + 'version' => 'int', ]; protected $dates = [ @@ -149,24 +161,32 @@ class UserBusiness extends Model 'email', 'first_name', 'last_name', - 'sales_volume_points', + 'sales_volume_KP_points', + 'sales_volume_TP_points', 'sales_volume_points_shop', - 'sales_volume_points_sum', + 'sales_volume_points_KP_sum', + 'sales_volume_points_TP_sum', 'sales_volume_total', 'sales_volume_total_shop', 'sales_volume_total_sum', + 'payline_points', + 'payline_points_qual_kp', 'margin', 'margin_shop', 'qual_kp', - 'qual_tp', + 'qual_pp', 'qual_user_level', + 'qual_user_level_next', 'next_qual_user_level', - 'total_tp', - 'total_qual_tp', - 'commission_team_total', + 'next_can_user_level', + 'total_pp', + 'total_qual_pp', 'commission_shop_sales', + 'commission_pp_total', + 'commission_growth_total', 'business_lines', 'user_items', + 'version', ]; public function user() diff --git a/app/Models/UserCredit.php b/app/Models/UserCredit.php index 1332dc14..8f4ce7cb 100644 --- a/app/Models/UserCredit.php +++ b/app/Models/UserCredit.php @@ -90,7 +90,7 @@ class UserCredit extends Model 'net' => 'float', 'tax_rate' => 'float', 'tax' => 'float', - 'taxable' => 'bool', + 'taxable' => 'int', 'total' => 'float', 'paid_out' => 'bool', 'cancellation' => 'bool', @@ -143,6 +143,13 @@ class UserCredit extends Model 10 => 'danger', ]; + public static $taxableTypes = [ + 0 => '', + 1 => 'umsatzsteuerpflichtig / DE', + 2 => 'nicht umsatzsteuerpflichtig / DE', + 3 => 'nicht umsatzsteuerpflichtig / Ausland' + ]; + public function user() { diff --git a/app/Models/UserCreditItem.php b/app/Models/UserCreditItem.php index 5febef2d..74f05596 100644 --- a/app/Models/UserCreditItem.php +++ b/app/Models/UserCreditItem.php @@ -47,9 +47,11 @@ class UserCreditItem extends Model public static $statusTypes = [ 1 => 'Provision Shop', - 2 => 'Provision Team', + 2 => 'Provision Payline', 3 => 'Guthaben hinzugefügt', 4 => 'commission ...', + 5 => 'Provision Wachstumsbonus', + ]; public static $statusColors = [ @@ -58,6 +60,7 @@ class UserCreditItem extends Model 2 => 'secondary', 3 => 'warning', 4 => 'info', + 5 => 'secondary', 10 => 'danger', ]; diff --git a/app/Models/UserHistory.php b/app/Models/UserHistory.php index 4e671f9a..3b7cedf9 100644 --- a/app/Models/UserHistory.php +++ b/app/Models/UserHistory.php @@ -38,11 +38,11 @@ use App\User; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereStatus($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereUserId($value) - * @mixin \Eloquent * @property string|null $identifier * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereIdentifier($value) * @property int|null $abo_options * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserHistory whereAboOptions($value) + * @mixin \Eloquent */ class UserHistory extends Model { diff --git a/app/Models/UserLevel.php b/app/Models/UserLevel.php index 4ca1e30e..d906b2ed 100644 --- a/app/Models/UserLevel.php +++ b/app/Models/UserLevel.php @@ -30,11 +30,10 @@ use App\Models\UserLevel as ModelsUserLevel; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel wherePos($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereTransName($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserLevel whereUpdatedAt($value) - * @mixin \Eloquent * @property int|null $next_id * @property int|null $margin_shop * @property int|null $qual_kp - * @property int|null $qual_tp + * @property int|null $qual_pp * @property string|null $growth_bonus * @property int|null $pr_line_1 * @property int|null $pr_line_2 @@ -42,6 +41,8 @@ use App\Models\UserLevel as ModelsUserLevel; * @property int|null $pr_line_4 * @property int|null $pr_line_5 * @property int|null $pr_line_6 + * @property int|null $pr_line_7 + * @property int|null $pr_line_8 * @property-read UserLevel|null $next_user_level * @method static \Illuminate\Database\Eloquent\Builder|UserLevel whereGrowthBonus($value) * @method static \Illuminate\Database\Eloquent\Builder|UserLevel whereMarginShop($value) @@ -54,6 +55,10 @@ use App\Models\UserLevel as ModelsUserLevel; * @method static \Illuminate\Database\Eloquent\Builder|UserLevel wherePrLine6($value) * @method static \Illuminate\Database\Eloquent\Builder|UserLevel whereQualKp($value) * @method static \Illuminate\Database\Eloquent\Builder|UserLevel whereQualTp($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserLevel wherePrLine7($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserLevel wherePrLine8($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserLevel whereQualPp($value) + * @mixin \Eloquent */ class UserLevel extends Model { @@ -62,7 +67,7 @@ class UserLevel extends Model protected $casts = ['trans_name' => 'array']; protected $fillable = [ - 'next_id', 'name', 'margin', 'margin_shop', 'qual_kp', 'qual_tp', 'growth_bonus', 'pr_line_1', 'pr_line_2', 'pr_line_3', 'pr_line_4', 'pr_line_5', 'pr_line_6', 'pos', 'active', 'default', + 'next_id', 'name', 'margin', 'margin_shop', 'qual_kp', 'qual_pp', 'growth_bonus', 'pr_line_1', 'pr_line_2', 'pr_line_3', 'pr_line_4', 'pr_line_5', 'pr_line_6', 'pr_line_7', 'pr_line_8', 'paylines', 'pos', 'active', 'default', ]; diff --git a/app/Models/UserSalesVolume.php b/app/Models/UserSalesVolume.php index 252ac432..8f3f4315 100644 --- a/app/Models/UserSalesVolume.php +++ b/app/Models/UserSalesVolume.php @@ -22,6 +22,7 @@ use App\User; * @property Carbon|null $date * @property int|null $points * @property int|null $month_points + * @property int $status_points * @property float|null $total_net * @property float|null $month_total_net * @property string|null $message @@ -56,10 +57,11 @@ use App\User; * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereUserInvoiceId($value) * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereYear($value) - * @mixin \Eloquent * @property array|null $syslog * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereSyslog($value) * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereInfo($value) + * @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereStatusPoints($value) + * @mixin \Eloquent */ class UserSalesVolume extends Model { @@ -72,8 +74,10 @@ class UserSalesVolume extends Model 'month' => 'int', 'year' => 'int', 'points' => 'int', - 'month_points' => 'int', + 'month_KP_points' => 'int', + 'month_TP_points' => 'int', 'month_shop_points' => 'int', + 'status_points' => 'int', 'total_net' => 'float', 'month_total_net' => 'float', 'month_shop_total_net' => 'float', @@ -93,8 +97,10 @@ class UserSalesVolume extends Model 'year', 'date', 'points', - 'month_points', + 'month_KP_points', + 'month_TP_points', 'month_shop_points', + 'status_points', 'total_net', 'month_total_net', 'month_shop_total_net', @@ -105,12 +111,18 @@ class UserSalesVolume extends Model ]; + public static $statusPointsTypes = [ + 1 => 'KP + TP', //Eigene + Team + 2 => 'KP', //nur Eigene nicht Team + ]; + public static $statusTypes = [ 0 => 'nicht zugewiesen', 1 => 'Beraterbestellung', //hinzugefügt aus 2 => 'Shopbestellung', //hinzugefügt aus 3 => 'Shopbestellung / pending', //hinzugefügt aus 4 => 'Gutschrift', //hinzugefügt aus + 5 => 'Registrierung', //hinzugefügt aus 10 => '' ]; @@ -120,6 +132,7 @@ class UserSalesVolume extends Model 2 => 'secondary', 3 => 'warning', 4 => 'info', + 5 => 'info', 10 => 'danger', ]; @@ -148,9 +161,13 @@ class UserSalesVolume extends Model return isset($this->attributes['date']) ? $this->attributes['date'] : NULL; } - public function getPointsSum(){ - return $this->month_points + $this->month_shop_points; + public function getPointsKPSum(){ + return $this->month_KP_points + $this->month_shop_points; //only KP für SUM - KP is for User } + public function getPointsTPSum(){ + return $this->month_TP_points + $this->month_shop_points; //only TP für SUM - TP is only for Payline + } + public function getTotalNetSum(){ return $this->month_total_net + $this->month_shop_total_net; } @@ -163,6 +180,13 @@ class UserSalesVolume extends Model return isset(self::$statusColors[$this->status]) ? self::$statusColors[$this->status] : "default"; } + public function getStatusPointsType(){ + return isset(self::$statusPointsTypes[$this->status_points]) ? self::$statusPointsTypes[$this->status_points] : ""; + } + public function getStatusPointsColor(){ + return isset(self::$statusColors[$this->status_points]) ? self::$statusColors[$this->status_points] : "default"; + } + public function getFormatedMonthYear(){ return str_pad($this->month, 2, "0", STR_PAD_LEFT)."/".$this->year; } diff --git a/app/Models/UserShop.php b/app/Models/UserShop.php index 633b7376..81c2ac36 100644 --- a/app/Models/UserShop.php +++ b/app/Models/UserShop.php @@ -64,8 +64,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShop whereUserId($value) * @method static \Illuminate\Database\Query\Builder|\App\Models\UserShop withTrashed() * @method static \Illuminate\Database\Query\Builder|\App\Models\UserShop withoutTrashed() - * @mixin \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|UserShop withUniqueSlugConstraints(\Illuminate\Database\Eloquent\Model $model, string $attribute, array $config, string $slug) + * @mixin \Eloquent */ class UserShop extends Model { diff --git a/app/Models/UserShopOnSite.php b/app/Models/UserShopOnSite.php index 5cf9c95c..43f0f227 100644 --- a/app/Models/UserShopOnSite.php +++ b/app/Models/UserShopOnSite.php @@ -33,8 +33,8 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShopOnSite whereSlug($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShopOnSite whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserShopOnSite whereUserShopId($value) - * @mixin \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|UserShopOnSite withUniqueSlugConstraints(\Illuminate\Database\Eloquent\Model $model, string $attribute, array $config, string $slug) + * @mixin \Eloquent */ class UserShopOnSite extends Model { diff --git a/app/Models/UserUpdateEmail.php b/app/Models/UserUpdateEmail.php index ee5edb2f..acaa9699 100644 --- a/app/Models/UserUpdateEmail.php +++ b/app/Models/UserUpdateEmail.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Model; * App\Models\UserUpdateEmail * * @property-read \App\User $user - * @mixin \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail newQuery() * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail query() @@ -20,6 +19,7 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail whereEmail($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail whereToken($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\UserUpdateEmail whereUserId($value) + * @mixin \Eloquent */ class UserUpdateEmail extends Model { diff --git a/app/Repositories/ContractPDFRepository.php b/app/Repositories/ContractPDFRepository.php index a61ef97f..73cf3d9c 100644 --- a/app/Repositories/ContractPDFRepository.php +++ b/app/Repositories/ContractPDFRepository.php @@ -5,15 +5,7 @@ namespace App\Repositories; use App\Libraries\ContractPDF; use App\Models\File; use App\User; -use Request; -use Response; use Storage; -use Util; -use Validator; - - - - class ContractPDFRepository extends BaseRepository { @@ -35,7 +27,10 @@ class ContractPDFRepository extends BaseRepository { } private function convert($str){ - return iconv('UTF-8', 'windows-1252', $str); + $search = array('Ő', 'ő', 'Ű', 'ű'); + $replace = array('Ö', 'ö', 'Ü', 'ü'); + $str = str_replace($search, $replace, $str); + return iconv('UTF-8', 'windows-1252//IGNORE', $str); } public function createContractPDF() { diff --git a/app/Repositories/CreditRepository.php b/app/Repositories/CreditRepository.php index bc357676..1d06ddaa 100644 --- a/app/Repositories/CreditRepository.php +++ b/app/Repositories/CreditRepository.php @@ -103,12 +103,16 @@ class CreditRepository extends BaseRepository { $this->user_credit->net += $userCreditItem->credit; } /* taxable_sales //user tax - 1 //umsatzsteuerpflichtig - 2 // nicht umsatzsteuerpflichtig + 1 //umsatzsteuerpflichtig / DE + 2 // nicht umsatzsteuerpflichtig /DE + 3 // nicht umsatzsteuerpflichtig / Ausland */ if($this->model->account){ - $this->user_credit->taxable = $this->model->account->taxable_sales == 2 ? false : true; - if($this->user_credit->taxable){ + $this->user_credit->taxable = $this->model->account->taxable_sales; + if($this->model->account->country_id !== 1){ + $this->user_credit->taxable = 3; + } + if($this->user_credit->taxable === 1){ $this->user_credit->tax_rate = config('app.main_tax_rate'); $this->user_credit->total = round($this->user_credit->net * config('app.main_tax'), 2); $this->user_credit->tax = $this->user_credit->total - $this->user_credit->net; diff --git a/app/Repositories/ProductRepository.php b/app/Repositories/ProductRepository.php index b9c8f286..69c39c1d 100644 --- a/app/Repositories/ProductRepository.php +++ b/app/Repositories/ProductRepository.php @@ -31,6 +31,7 @@ class ProductRepository extends BaseRepository { $data['no_commission'] = isset($data['no_commission']) ? 1 : 0; $data['no_free_shipping'] = isset($data['no_free_shipping']) ? 1 : 0; $data['buying_restriction'] = isset($data['buying_restriction']) ? 1 : 0; + $data['sponsor_buying_points'] = isset($data['sponsor_buying_points']) ? 1 : 0; $data['show_on'] = isset($data['show_on']) ? $data['show_on'] : null; diff --git a/app/Services/BusinessPlan/BusinessUserItem.php b/app/Services/BusinessPlan/BusinessUserItem.php index 746fb08a..2367c920 100644 --- a/app/Services/BusinessPlan/BusinessUserItem.php +++ b/app/Services/BusinessPlan/BusinessUserItem.php @@ -34,6 +34,9 @@ class BusinessUserItem } //read User here, can delete in stored data. $user = User::find($user_id); + if(!$user){ + return; + } $user_level_active = $user->user_level ? $user->user_level : null; $this->user_level_active_pos = $user_level_active ? $user_level_active->pos : 0; $this->b_user = new UserBusiness(); @@ -50,18 +53,28 @@ class BusinessUserItem 'email' => $user->email, 'first_name' => $user->account->first_name, 'last_name' => $user->account->last_name, - 'sales_volume_points' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_points'), + + 'sales_volume_KP_points' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_KP_points'), + 'sales_volume_TP_points' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_TP_points'), 'sales_volume_points_shop' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_points_shop'), - 'sales_volume_points_sum' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_points_sum'), + + 'sales_volume_points_KP_sum' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_points_KP_sum'), //KP + Shop Points + 'sales_volume_points_TP_sum' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_points_TP_sum'), //TP + Shop Points + 'sales_volume_total' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_total'), 'sales_volume_total_shop' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_total_shop'), 'sales_volume_total_sum' => $user->getUserSalesVolumeBy($this->date->month, $this->date->year, 'sales_volume_total_sum'), - 'margin' => $user_level_active ? $user_level_active->margin : 0, - 'margin_shop' => $user_level_active ? $user_level_active->margin_shop : 0, - 'qual_kp' => $user_level_active ? $user_level_active->qual_kp : 0, - 'qual_tp' => $user_level_active ? $user_level_active->qual_tp : 0, - 'commission_team_total' => 0, + + 'margin' => $user_level_active ? $user_level_active->margin : 0, //is fix Rabatt für Kundenbestellungen + 'margin_shop' => $user_level_active ? $user_level_active->margin_shop : 0, //is fix Rabatt für Shopbestellungen + 'qual_kp' => $user_level_active ? $user_level_active->qual_kp : 0, //KP Kundenpoints from level + 'qual_pp' => $user_level_active ? $user_level_active->qual_pp : 0, //PP Payline Points from level + + 'payline_points' => 0, + 'commission_pp_total' => 0, 'commission_shop_sales' => 0, + 'commission_growth_total' => 0, + 'version' => 2, ]; $this->b_user->fill($fill); $this->b_user->business_lines = []; @@ -73,6 +86,7 @@ class BusinessUserItem public function addUserID(){ TreeCalcBot::addUserID($this->b_user->user_id); } + public function getBUser(){ return $this->b_user; } @@ -88,43 +102,160 @@ class BusinessUserItem } public function addTotalTP($points){ - $this->b_user->total_tp += $points; - + $this->b_user->total_pp += $points; } public function isQualKP(){ - return ($this->sales_volume_points_sum >= $this->qual_kp) ? true : false; + return ($this->sales_volume_points_KP_sum >= $this->qual_kp) ? true : false; } + public function isQualLevel(){ + return ($this->qual_user_level) ? true : false; + } + + public function isQualEqualLevel(){ + if($this->qual_user_level){ + return ($this->m_level_id == $this->qual_user_level['id']) ? true : false; + } + return false; + } + + public function getQualLevelPaylines(){ + if($this->qual_user_level){ + return $this->qual_user_level['paylines']; + } + return 0; + } + + public function isQualLevelGrowth($line){ + if(isset($this->business_lines[$line])){ + $object = $this->business_lines[$line]; + if(isset($object->growth_bonus)){ + return true; + } + } + return false; + } + + public function getRestQualKP(){ - return $this->sales_volume_points_sum - $this->qual_kp; + $ret = $this->sales_volume_points_KP_sum - $this->qual_kp; + return $ret > 0 ? $ret : 0; } public function getCommissionTotal(){ - return round($this->commission_shop_sales + $this->commission_team_total, 2); + return round($this->commission_shop_sales + $this->commission_pp_total + $this->commission_growth_total, 2); } + //Provisierungslevel brechnen, Berechnung der Provisionen nach Level + public function calcQualPP(){ - public function calcQualTP(){ - if($this->isQualKP()){ - $this->b_user->total_qual_tp = $this->total_tp + $this->getRestQualKP(); - $commission_total = 0; - $qualUserLevel = UserLevel::where('qual_tp', '<=', $this->total_qual_tp)->where('pos', '<=', $this->user_level_active_pos)->orderBy('qual_tp', 'desc')->first(); - $nextQualUserLevel = UserLevel::where('qual_tp', '<=', $this->total_qual_tp)->where('pos', '>', $this->user_level_active_pos)->orderBy('qual_tp', 'desc')->first(); - if($nextQualUserLevel){ - $this->b_user->next_qual_user_level = $nextQualUserLevel->toArray(); - } - if($qualUserLevel){ - $this->b_user->qual_user_level = $qualUserLevel->toArray(); - foreach($this->business_lines as $line => $object){ - //growth_bonus = ab ebene 6 wachstumsbonus - $object->margin = ($line <= 6) ? $this->qual_user_level['pr_line_'.$line] : $this->qual_user_level['growth_bonus']; - $object->commission = round($object->points / 100 * $object->margin, 2); - $commission_total += $object->commission; - $this->b_user->business_lines[$line] = $object; + //das ist der erreichte Provisierungslevel, nach paylinePoints und KP + $qualUserLevel = $this->calcuQualLevel(); + if($qualUserLevel !== NULL){ + //prüfe einen Aufsieg im KarriereLevel + $this->setNextUserLevel(); + $this->b_user->qual_user_level = $qualUserLevel->toArray(); + //setzen nächsten ProvisionsLevel wenn not isQualEqualLevel + $this->setQualNextLevel(); + //Berechnung der Provisionen in der Payline + $commission_pp_total = 0; + $commission_growth_total = 0; + for ($i=1; $i <= $qualUserLevel->paylines ; $i++) { + if(isset($this->business_lines[$i])){ + $object = $this->business_lines[$i]; + $object->margin = $this->qual_user_level['pr_line_'.$i]; //provision in % + $object->commission = round($object->points / 100 * $object->margin, 2); //provision in points/euro + $object->payline = true; + $commission_pp_total += $object->commission; + $this->b_user->business_lines[$i] = $object; } } - $this->b_user->commission_team_total = $commission_total; + //Berechnung der Provisionen nach WB + if($qualUserLevel->growth_bonus){ + //['growth_bonus'] // + $payline = (int) $this->b_user->qual_user_level['paylines'] + 1; + $maxlines = count($this->business_lines) + 1; + $growth_bonus = (float) $this->b_user->qual_user_level['growth_bonus']; + + for ($i=$payline; $i <= $maxlines ; $i++) { + if(isset($this->business_lines[$i])){ + $object = $this->business_lines[$i]; + $object->margin = $growth_bonus; //provision in % + $object->commission = round($object->points / 100 * $object->margin, 2); //provision in points/euro + $object->growth_bonus = true; + $commission_growth_total += $object->commission; + $this->b_user->business_lines[$i] = $object; + } + } + + } + $this->b_user->commission_pp_total = $commission_pp_total; + $this->b_user->commission_growth_total = $commission_growth_total; + + }else{ + //erste Provisierungslevel als next setzen, hat keine oder wenig points + $qualUserLevelNext = UserLevel::where('pos', '=', 1)->orderBy('qual_pp', 'asc')->first(); + if($qualUserLevelNext){ + $this->b_user->qual_user_level_next = $qualUserLevelNext->toArray(); + } } + + + } + + //qualifikation nach qual_kp (KundenPoints) und qual_pp (PaylinePoints) + public function calcuQualLevel(){ + //alle levels wo die qual_kp erreicht ist, sortiert nach Rang > + $qualUserLevels = UserLevel::where('qual_kp', '<=', $this->sales_volume_points_KP_sum)->where('pos', '<=', $this->user_level_active_pos)->orderBy('qual_pp', 'desc')->get(); + foreach($qualUserLevels as $qualUserLevel){ + //brechnet die Points nach der Payline + $payline_points = $this->getPointsforPayline($qualUserLevel->paylines); + $payline_points_qual_kp = $payline_points + $this->getRestQualKP(); + if($payline_points_qual_kp >= $qualUserLevel->qual_pp){ + //match payline_points erreicht, ist der akutelle Level für die Provision + $this->b_user->payline_points = $payline_points; + $this->b_user->payline_points_qual_kp = $payline_points_qual_kp; + + return $qualUserLevel; + } + } + return NULL; + } + + + // PaylinePoints nach paylines / welche ebenen gezählt werden, 3,4,5,6 ... + private function getPointsforPayline($paylines){ + $payline_points = 0; + for ($i=1; $i <= $paylines ; $i++) { + if(isset($this->business_lines[$i])){ + $payline_points += $this->business_lines[$i]->points; + } + } + return $payline_points; + } + //wenn nicht erreicht, was wäre der nächste Provisionslevel? + private function setQualNextLevel(){ + if(!$this->isQualEqualLevel()){ + $qualUserLevelNext = UserLevel::where('id', '=', $this->b_user->qual_user_level['next_id'])->orderBy('qual_pp', 'asc')->first(); + if($qualUserLevelNext){ + $this->b_user->qual_user_level_next = $qualUserLevelNext->toArray(); + } + } + } + + private function setNextUserLevel(){ + dd($this->b_user->payline_points_qual_kp); + $this->b_user->total_qual_pp = $this->total_pp + $this->getRestQualKP(); + $nextQualUserLevel = UserLevel::where('qual_pp', '<=', $this->total_qual_pp)->where('pos', '>', $this->user_level_active_pos)->orderBy('qual_pp', 'desc')->first(); + if($nextQualUserLevel && $this->isQualKP()){ + $this->b_user->next_qual_user_level = $nextQualUserLevel->toArray(); + }else{ + //wenn nicht erreicht, was wäre der nächste Karrierelevel? + $nextCanUserLevel = UserLevel::where('pos', '>', $this->user_level_active_pos)->orderBy('qual_pp', 'asc')->first(); + if($nextCanUserLevel){ + $this->b_user->next_can_user_level = $nextCanUserLevel->toArray(); + } + } } /*public function storeUser(){ @@ -174,7 +305,6 @@ class BusinessUserItem } } - public function readStoredParentsBusinessUsers($structure){ $parents = $this->findParentsBusinessOnStored($this->b_user->user_id, $structure); diff --git a/app/Services/BusinessPlan/ExportBot.php b/app/Services/BusinessPlan/ExportBot.php new file mode 100644 index 00000000..1fde3b2c --- /dev/null +++ b/app/Services/BusinessPlan/ExportBot.php @@ -0,0 +1,120 @@ +date = Carbon::now(); + $this->init_from = $init_from; + } + + public function initStructureUser(User $user, $order='list') //tree or list + { + $line = 0; + $this->order = $order; + $this->root_user = $user; + + if($this->order === 'tree'){ + $this->user_tree = $this->setUserValues($user, $line); + $this->user_tree->childs = $this->readChildUsers($this->user_tree, $line+1); + } + if($this->order === 'list'){ + $this->user_list = $this->setUserValues($user, $line); + $this->readChildUsers($this->user_list, $line+1); + } + + + } + + + private function readChildUsers($parent_user, $line){ + + $childUsers = []; + $users = User::with('account')->select('users.*') + ->where('users.deleted_at', '=', null) + ->where('users.id', '!=', 1) + ->where('users.admin', "<", 4) + ->where('users.m_level', "!=", null) + ->where('users.m_sponsor', "=", $parent_user->user_id) //<- need the id for childs / sponsors + ->where('users.payment_account', "!=", null) + ->where('users.active', "=", 1) + ->get(); + + if($users){ + foreach($users as $user){ + $user_values = $this->setUserValues($user, $line); + $childUsers[] = $user_values; + if($this->order === 'list'){ + $this->user_list->childs[] = $user_values; + $this->readChildUsers($user_values, $line+1); + } + } + } + return $childUsers; + } + + private function setUserValues(User $user, $line){ + + $sponsor_name = ""; + if($user->m_sponsor && $user->user_sponsor->account){ + $sponsor_name = $user->user_sponsor->account->m_first_name." ".$user->user_sponsor->account->m_last_name; + } + $obj = new stdClass(); + $obj->line = $line; + + $obj->user_id = $user->id; + $obj->m_level = $user->m_level; + $obj->level_name = $user->user_level ? $user->user_level->name : ''; + $obj->m_sponsor = $user->m_sponsor; + $obj->sponsor_name = $sponsor_name; + $obj->m_account = $user->m_account; + $obj->email = $user->email; + $obj->active_account = $user->payment_account ? Carbon::parse($user->payment_account)->gt(Carbon::parse($this->date->format('Y-m-d H:i:s'))) : 0; + $obj->payment_account_date = $user->payment_account ? $user->getPaymentAccountDateFormat(false) : ""; + $obj->first_name = $user->account->first_name; + $obj->last_name = $user->account->last_name; + $obj->address = $user->account->address; + $obj->address_2 = $user->account->address_2; + $obj->zipcode = $user->account->zipcode; + $obj->city = $user->account->city; + $obj->country_id = $user->account->country_id ? $user->account->country->de : ""; + $pre_phone = $user->account->pre_phone_id != "" ? $user->account->pre_phone->phone." " : ""; + $pre_mobil = $user->account->pre_mobil_id != "" ? $user->account->pre_mobil->phone." " : ""; + $obj->phone = $pre_phone.$user->account->phone; + $obj->mobil = $pre_mobil.$user->account->mobil; + $obj->birthday = $user->account->birthday; + + if($this->order === 'tree'){ + $obj->childs = $this->readChildUsers($obj, $line+1); + } + if($this->order === 'list'){ + $obj->childs = []; + } + + return $obj; + } + + + + + public function getUser(){ + return $this->root_user; + } + + +} diff --git a/app/Services/BusinessPlan/SalesPointsVolume.php b/app/Services/BusinessPlan/SalesPointsVolume.php index 228bf52f..147c1a0d 100644 --- a/app/Services/BusinessPlan/SalesPointsVolume.php +++ b/app/Services/BusinessPlan/SalesPointsVolume.php @@ -2,6 +2,7 @@ namespace App\Services\BusinessPlan; use App\User; +use stdClass; use App\Services\Util; use App\Models\ShoppingOrder; use App\Models\UserSalesVolume; @@ -33,7 +34,9 @@ class SalesPointsVolume $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; + $from_email = $form_user ? $form_user->email : ''; + $to_email = $to_user ? $to_user->email : ''; + $syslog[date('d.m.Y-h:i:s')] = 'change form: #'.$form_user_id.' '.$from_email.' to: #'.$to_user_id.' '.$to_email; $shoppingOrder->user_sales_volume->syslog = $syslog; $shoppingOrder->user_sales_volume->save(); @@ -47,10 +50,23 @@ class SalesPointsVolume } + private static function add_KP_TP_Points($userSalesVolume, $month_points){ + if($userSalesVolume->status_points === 2) { //KP + $month_points->KP += $userSalesVolume->points; + }else{ + // === 1 //TP + KP + $month_points->KP += $userSalesVolume->points; + $month_points->TP += $userSalesVolume->points; + } + return $month_points; + } + public static function reCalculateSalesPointsVolume($user_id, $month, $year){ $userSalesVolumes = UserSalesVolume::where('user_id', $user_id)->where('month', $month)->where('year', $year)->orderBy('id', 'ASC')->get(); - $month_points = 0; + $month_points = new stdClass(); + $month_points->KP = 0; + $month_points->TP = 0; $month_total_net = 0; $month_shop_points = 0; $month_shop_total_net = 0; @@ -59,21 +75,26 @@ class SalesPointsVolume foreach($userSalesVolumes as $userSalesVolume){ switch ($userSalesVolume->status) { case 1: //Bestellung Berater - $month_points += $userSalesVolume->points; + $month_points = self::add_KP_TP_Points($userSalesVolume, $month_points); $month_total_net += $userSalesVolume->total_net; break; case 2: //Shop $month_shop_points += $userSalesVolume->points; $month_shop_total_net += $userSalesVolume->total_net; break; - case 4: //add Berater - $month_points += $userSalesVolume->points; + case 4: //Gutschrift + $month_points = self::add_KP_TP_Points($userSalesVolume, $month_points); $month_total_net += $userSalesVolume->total_net; break; + case 4: //Registrierung + $month_points = self::add_KP_TP_Points($userSalesVolume, $month_points); + $month_total_net += $userSalesVolume->total_net; + break; } $userSalesVolume->month_shop_points = $month_shop_points; $userSalesVolume->month_shop_total_net = $month_shop_total_net; - $userSalesVolume->month_points = $month_points; + $userSalesVolume->month_KP_points = $month_points->KP; + $userSalesVolume->month_TP_points = $month_points->TP; $userSalesVolume->month_total_net = $month_total_net; $userSalesVolume->save(); } @@ -88,6 +109,7 @@ class SalesPointsVolume 2 => 'hinzugefügt aus Shop', 3 => 'hinzugefügt aus Shop / pending', */ + $status = self::getStatusByOrderPaymentFor($shoppingOrder); $user_id = $shoppingOrder->auth_user_id ? $shoppingOrder->auth_user_id : $shoppingOrder->member_id; //akuteller tag / Monat. @@ -95,45 +117,27 @@ class SalesPointsVolume $year = date('Y'); $date = date('d.m.Y'); - if($status === 3){ //shop bestellung User pending if is_like - $user_id = NULL;//$shoppingOrder->auth_user_id ? $shoppingOrder->auth_user_id : $shoppingOrder->member_id; - $month_points = 0; - $month_total_net = 0; - $month_shop_points = 0; - $month_shop_total_net = 0; - }else{ - $month_points = UserSalesVolume::where('user_id', $user_id)->where('status', 1)->where('month', $month)->where('year', $year)->sum('points'); - $month_total_net = UserSalesVolume::where('user_id', $user_id)->where('status', 1)->where('month', $month)->where('year', $year)->sum('total_net'); - $month_shop_points = UserSalesVolume::where('user_id', $user_id)->where('status', 2)->where('month', $month)->where('year', $year)->sum('points'); - $month_shop_total_net = UserSalesVolume::where('user_id', $user_id)->where('status', 2)->where('month', $month)->where('year', $year)->sum('total_net'); - } - switch ($status) { - case 1: //Bestellung - $month_points += $shoppingOrder->points; - $month_total_net += $shoppingOrder->subtotal; - break; - case 2: //Shop - $month_shop_points += $shoppingOrder->points; - $month_shop_total_net += $shoppingOrder->subtotal; - break; - } - return UserSalesVolume::create([ + if($status === 3){ //shop bestellung User pending if is_like + $user_id = NULL; + } + $user_sales_volume = UserSalesVolume::create([ 'user_id' => $user_id, 'shopping_order_id' => $shoppingOrder->id, 'month' => $month, 'year' => $year, 'date' => $date, 'points' => $shoppingOrder->points, - 'month_points' => $month_points, - 'month_shop_points' => $month_shop_points, - 'total_net' => $shoppingOrder->subtotal, - 'month_total_net' => $month_total_net, - 'month_shop_total_net' => $month_shop_total_net, + 'total_net' => $shoppingOrder->subtotal, + 'status_points' => 1, //KP + TP 'message' => '', 'status' => $status, ]); + if($status !== 3){ + self::reCalculateSalesPointsVolume($user_sales_volume->user_id, $user_sales_volume->month, $user_sales_volume->year); + } + } public static function setToUserAndReCalculate(UserSalesVolume $user_sales_volume, $user_id){ @@ -181,6 +185,7 @@ class SalesPointsVolume $user_sales_volume->message = 'geändert: '.date('d.m.Y'); $user_sales_volume->info = $data['info']; + $user_sales_volume->status_points = $data['status_points']; $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; @@ -198,7 +203,6 @@ class SalesPointsVolume public static function addSalesPointsVolume($data){ - if(!isset($data['user_id'])){ \Session()->flash('alert-error', 'Kein Berater ausgewählt'); return; @@ -211,7 +215,7 @@ class SalesPointsVolume $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; - + $status = isset($data['status']) ? intval($data['status']) : 4; $user_sales_volume = UserSalesVolume::create([ 'user_id' => $user->id, @@ -220,11 +224,12 @@ class SalesPointsVolume 'year' => $year, 'date' => $date, 'points' => $points, + 'status_points' => $data['status_points'], 'total_net' => $total_net, 'message' => 'hinzugefügt: '.date('d.m.Y'), 'info' => $data['info'], 'syslog' => $syslog, - 'status' => 4, + 'status' => $status, ]); diff --git a/app/Services/BusinessPlan/SalesPointsVolumeHelper.php b/app/Services/BusinessPlan/SalesPointsVolumeHelper.php new file mode 100644 index 00000000..27a65449 --- /dev/null +++ b/app/Services/BusinessPlan/SalesPointsVolumeHelper.php @@ -0,0 +1,12 @@ +date = new stdClass(); - $date = \Carbon::parse($year.'-'.$month.'-1'); + $date = Carbon::parse($year.'-'.$month.'-1'); $this->date->month = $month; $this->date->year = $year; $this->date->start_date = $date->format('Y-m-d H:i:s'); @@ -49,7 +50,7 @@ class TreeCalcBot public function initStructureUser($user_id) { - + $BusinessUserItem = new BusinessUserItem($this->date); $BusinessUserItem->makeUser($user_id); $BusinessUserItem->addUserID(); @@ -63,13 +64,10 @@ class TreeCalcBot $this->readStoredSponsorUser($this->business_users[0]->sponsor->user_id); } - }else{ $this->readParentsUsers(); $this->readSponsorUser($user_id); } - - } @@ -79,12 +77,14 @@ class TreeCalcBot $this->business_user->makeUser($user->id); $this->business_user->checkSponsor($user); if(!$this->business_user->isSave()){ + //Aufbau der Struktur für den User in die unendliche Tiefe. $this->business_user->readParentsBusinessUsers(); - //calculate Lines + //calculate Points in Lines if(count($this->business_user->businessUserItems) > 0){ - $this->calcUserTP($this->business_user->businessUserItems, 1); + $this->calcUserPoints($this->business_user->businessUserItems, 1); } - $this->business_user->calcQualTP(); + //qualifikation nach qual_kp (KundenPoints) und qual_pp (PaylinePoints) + $this->business_user->calcQualPP(); } } @@ -102,7 +102,7 @@ class TreeCalcBot return false; } - private function calcUserTP($businessUserItems, $line){ + private function calcUserPoints($businessUserItems, $line){ if(!isset($this->business_user->business_lines[$line])){ $obj = new stdClass(); $obj->points = 0; @@ -110,10 +110,12 @@ class TreeCalcBot } foreach($businessUserItems as $business_user_item){ if(count($business_user_item->businessUserItems) > 0){ - $this->calcUserTP($business_user_item->businessUserItems, $line+1); + $this->calcUserPoints($business_user_item->businessUserItems, $line+1); } - $this->business_user->addBusinessLinePoints($line, $business_user_item->sales_volume_points_sum); - $this->business_user->addTotalTP($business_user_item->sales_volume_points_sum); + //business_lines points nach line + $this->business_user->addBusinessLinePoints($line, $business_user_item->sales_volume_points_TP_sum); //TP + Shop Points + //total_pp gesamte Punkte + $this->business_user->addTotalTP($business_user_item->sales_volume_points_TP_sum); //TP + Shop Points } } @@ -259,7 +261,8 @@ class TreeCalcBot private function addItem($item, $deep){ $button = ''; - if(($this->init_from === 'admin' && \Auth::user()->isAdmin()) || ($this->init_from === 'member' && \Auth::user()->id === $item->user_id)){ + + if(($this->init_from === 'admin' && \Auth::user()->isAdmin()) || ($this->init_from === 'member')){ // && \Auth::user()->id === $item->user_id $button = ' | '; + } + return '
  • '. + '
    +
    +
    + '.(($deep > 0) ? '
    '.$deep.'
    ' : '').' +
    +
    + +
    +
    + + +
    '. + $this->addParentItem($item, $deep). + '
  • '; + + } + + private function addParentItem($item, $deep){ + if($item->businessUserItems){ + $ret = '
      '; + foreach($item->businessUserItems as $parent){ + $ret .= $this->addItem($parent, $deep+1); + } + $ret .='
    '; + return $ret; + } + return; + } + + + public function isParentless(){ + return $this->parentless ? true : false; + } + + public function makeParentlessHtml(){ + $ret = ""; + foreach($this->parentless as $item){ + $ret .= '
  • '. + '
    + +
    '. + '
  • '; + } + return $ret; + } + + public function makeSponsorHtml(){ + + if($this->sponsor){ + //' | ' + $ret = '
  • '. + '
    + +
    +
  • '; + + return $ret; + } + return 'Keinen Sponsor zugewiesen'; + + + } + +} diff --git a/app/Services/Credit.php b/app/Services/Credit.php index c591486e..8701dbfd 100644 --- a/app/Services/Credit.php +++ b/app/Services/Credit.php @@ -11,14 +11,16 @@ class Credit { public static function getCreditNumber(){ - return (int) Setting::getContentBySlug('credit-number'); + //return (int) Setting::getContentBySlug('credit-number'); + return (int) Setting::getContentBySlug('invoice-number'); } public static function makeNextCreditNumber(){ $credit_number = self::getCreditNumber(); $credit_number = $credit_number+1; - Setting::setContentBySlug('credit-number', $credit_number, 'int'); + //Setting::setContentBySlug('credit-number', $credit_number, 'int'); + Setting::setContentBySlug('invoice-number', $credit_number, 'int'); return $credit_number; } diff --git a/app/Services/CustomerPriority.php b/app/Services/CustomerPriority.php index c86b2015..8e68aba2 100644 --- a/app/Services/CustomerPriority.php +++ b/app/Services/CustomerPriority.php @@ -200,7 +200,7 @@ class CustomerPriority } public static function entryIsMember($shopping_user){ - if($user = User::whereEmail($shopping_user->billing_email)->first()){ + if($user = User::whereEmail($shopping_user->billing_email)->whereActive(1)->first()){ $member_id = $user->id; $shopping_user->member_id = $member_id; $shopping_user->number = self::nextNumber(); diff --git a/app/Services/HomepartyUserCart.php b/app/Services/HomepartyUserCart.php index 745eaaba..9cfd1607 100644 --- a/app/Services/HomepartyUserCart.php +++ b/app/Services/HomepartyUserCart.php @@ -24,6 +24,8 @@ class HomepartyUserCart public $ek_price; public $ek_price_net; + public $real_price; + public $income_price; public $weight; @@ -49,6 +51,8 @@ class HomepartyUserCart $this->ek_price = 0; $this->ek_price_net = 0; + $this->real_price = 0; + $this->income_price = 0; $this->weight = 0; $this->shipping_weight = 0; @@ -64,6 +68,7 @@ class HomepartyUserCart foreach ($this->homepartyUser->homeparty_user_order_items as $order_item) { $this->points += $order_item->getTotalPoints(); $this->price += $order_item->getTotalPrice(); + $this->real_price += $order_item->getTotalPrice(); $this->price_net += $order_item->geTotalPriceNet(); $this->ek_price += $order_item->geTotalEKPrice(); $this->ek_price_net += $order_item->geTotalEKPriceNet(); @@ -72,7 +77,9 @@ class HomepartyUserCart } } - + public function isPrice(){ + return ($this->real_price) > 0 ? true : false; + } public function getFormattedPoints() { return formatNumber($this->points, 0); @@ -83,6 +90,11 @@ class HomepartyUserCart return formatNumber($this->price); } + public function getFormattedPriceWithout() + { + return formatNumber($this->price - $this->shipping_price); + } + public function getFormattedPriceNet() { return formatNumber($this->price_net); @@ -140,6 +152,9 @@ class HomepartyUserCart case 'Price': $rNumber = $this->price * $faktor; break; + case 'PriceWithout': + $rNumber = ($this->price - $this->shipping_price) * $faktor; + break; case 'EkPrice': $rNumber = $this->ek_price * $faktor; break; diff --git a/app/Services/Payment.php b/app/Services/Payment.php index f56c17ca..ad0952f1 100644 --- a/app/Services/Payment.php +++ b/app/Services/Payment.php @@ -12,6 +12,7 @@ use App\Models\ShoppingPayment; use App\Services\ShopApiOrderCart; use Illuminate\Support\Facades\Mail; use App\Repositories\InvoiceRepository; +use App\Services\BusinessPlan\SalesPointsVolume; class Payment { @@ -106,6 +107,21 @@ class Payment ]); } + public static function addSponsorBuyingPoints(User $user, $product){ + + if($user->user_sponsor){ + $data = [ + 'user_id' => $user->user_sponsor->id, + 'total_net' => 0, + 'points' => $product->sponsor_buying_points_amount, + 'info' => 'VP: '.$user->getFullName(false).' | '.$product->name, + 'status_points' => 2, + 'status' => 5 + ]; + SalesPointsVolume::addSalesPointsVolume($data); + } + } + public static function updateUserLevel(User $user, $to_level_id){ //nur updaten, wenn der user->m_level kleiner ist als $to_level_id if($user->user_level){ @@ -140,6 +156,9 @@ class Payment if($shopping_order_item->product->buying_restriction){ self::addBuyingRestriction($user, $shopping_order_item->product->id); } + if($shopping_order_item->product->sponsor_buying_points){ + self::addSponsorBuyingPoints($user, $shopping_order_item->product); + } if($shopping_order_item->product->action){ $send_link = true; //new date diff --git a/app/Services/ShopApiOrderCart.php b/app/Services/ShopApiOrderCart.php index 6b1a8880..bce9db5a 100644 --- a/app/Services/ShopApiOrderCart.php +++ b/app/Services/ShopApiOrderCart.php @@ -80,6 +80,7 @@ class ShopApiOrderCart //only for tax split / tax and price on calculate function $this->shoppingCollectOrder->addTaxToSplit($tax_rate, $user_tax_qty); + $this->shoppingCollectOrder->addNetToSplit($tax_rate, $user_price_net_qty); $this->shoppingCollectOrder->tax_total += $user_tax_qty; $this->shoppingCollectOrder->price_total_net += $user_price_net_qty; $this->shoppingCollectOrder->points += ($item->points * $item->qty); @@ -96,6 +97,7 @@ class ShopApiOrderCart $this->shoppingCollectOrder->tax_total += $this->shoppingCollectOrder->shipping_tax; //add shipping tax to split $this->shoppingCollectOrder->addTaxToSplit(config('app.main_tax_rate'), $this->shoppingCollectOrder->shipping_tax); + $this->shoppingCollectOrder->addNetToSplit(config('app.main_tax_rate'), $this->shoppingCollectOrder->shipping_net); $this->shoppingCollectOrder->price_total_net += $this->shoppingCollectOrder->shipping_net; $this->shoppingCollectOrder->price_total = round($this->shoppingCollectOrder->tax_total + $this->shoppingCollectOrder->price_total_net, 2); diff --git a/app/Services/SyS/ChangeUserBusinesses.php b/app/Services/SyS/ChangeUserBusinesses.php new file mode 100644 index 00000000..de9bc0c1 --- /dev/null +++ b/app/Services/SyS/ChangeUserBusinesses.php @@ -0,0 +1,67 @@ +qual_user_level){ + $qual_user_level = $user_business->qual_user_level; + if(isset($qual_user_level['qual_tp'])){ + $qual_user_level['qual_pp'] = $qual_user_level['qual_tp']; + unset($qual_user_level['qual_tp']); + } + if(!isset($qual_user_level['paylines'])){ + $qual_user_level['paylines'] = 6; + + } + $user_business->qual_user_level = $qual_user_level; + $c ++; + $user_business->save(); + } + + if($user_business->next_qual_user_level){ + $next_qual_user_level = $user_business->next_qual_user_level; + if(isset($next_qual_user_level['qual_tp'])){ + $next_qual_user_level['qual_pp'] = $next_qual_user_level['qual_tp']; + unset($next_qual_user_level['qual_tp']); + } + if(!isset($next_qual_user_level['paylines'])){ + $next_qual_user_level['paylines'] = 6; + } + $user_business->next_qual_user_level = $next_qual_user_level; + + $c ++; + $user_business->save(); + } + + + } + dump("counter"); + dd($c); + + + } + + + public static function store() + { + $data = Request::all(); + \Session()->flash('alert-save', true); + return back(); + } + + +} diff --git a/app/Services/SyS/Correction.php b/app/Services/SyS/Correction.php index 8e8699d0..6c475c29 100644 --- a/app/Services/SyS/Correction.php +++ b/app/Services/SyS/Correction.php @@ -16,7 +16,7 @@ use App\Services\BusinessPlan\SalesPointsVolume; class Correction { - private static function userSalesVolume($order){ + private static function calcuUserSalesVolume($order){ /* status 1 => 'hinzugefügt aus Bestellung', @@ -78,9 +78,9 @@ class Correction $c = 0; - if(true){ //11 + if(false){ //11 dump("calculate user_sales_volumes from Orders"); - //dd('check function'); + dd('check function'); $year = 21; $months = range(1, 12); foreach($months as $month){ @@ -89,7 +89,7 @@ class Correction if(UserSalesVolume::whereShoppingOrderId($item->id)->count() === 0){ dump($item->id); - self::userSalesVolume($item); + self::calcuUserSalesVolume($item); } $c ++; } @@ -141,7 +141,7 @@ class Correction } if(false){ //9 - dump("make homeparty tax_split in shopping_order"); + dump("make getOrderPaymentFor in shopping_order"); dd('check function'); $ShoppingOrders = ShoppingOrder::where('payment_for', '=', NULL)->get(); @@ -160,6 +160,7 @@ class Correction if(false){ //8 dump("make homeparty tax_split in shopping_order"); dd('check function'); + $ShoppingOrders = ShoppingOrder::where('homeparty_id', '!=', NULL)->get(); //->skip(0)->take(500)->get(); //->skip(500)->take(500)->get(); @@ -198,9 +199,10 @@ class Correction if(false){ //6 dump("make tax_split in shopping_order"); dd('check function'); - $ShoppingOrders = ShoppingOrder::where('homeparty_id', '=', NULL)->get(); - //->skip(0)->take(500)->get(); - //->skip(500)->take(500)->get(); + + $ShoppingOrders = ShoppingOrder::where('homeparty_id', '=', NULL)//->get(); + ->skip(0)->take(3000)->get(); + //->skip(3000)->take(5000)->get(); foreach($ShoppingOrders as $ShoppingOrder){ $ShoppingOrder->makeTaxSplit(); $c ++; diff --git a/app/Services/Util.php b/app/Services/Util.php index a75938b1..e340750a 100644 --- a/app/Services/Util.php +++ b/app/Services/Util.php @@ -81,6 +81,7 @@ class Util } public static function formatNumber($value, $dec=2){ + $value = floatval(str_replace(',', '', $value)); return number_format($value, $dec, self::_decimal_separator(), self::_thousands_separator()); } diff --git a/app/User.php b/app/User.php index 3049eeb6..cfb178fd 100755 --- a/app/User.php +++ b/app/User.php @@ -32,7 +32,6 @@ use Laravel\Passport\HasApiTokens; * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereRememberToken($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereToken($value) * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereUpdatedAt($value) - * @mixin \Eloquent * @property int $confirmed * @property string|null $confirmation_code * @property string|null $confirmation_date @@ -116,6 +115,7 @@ use Laravel\Passport\HasApiTokens; * @property-read int|null $tokens_count * @property array|null $payment_methods * @method static \Illuminate\Database\Eloquent\Builder|\App\User wherePaymentMethods($value) + * @mixin \Eloquent */ class User extends Authenticatable { @@ -482,18 +482,23 @@ class User extends Authenticatable } if($this->userSalesVolume){ switch ($key) { - case 'sales_volume_points': - return $this->userSalesVolume->month_points; + case 'sales_volume_KP_points': + return $this->userSalesVolume->month_KP_points; + break; + case 'sales_volume_TP_points': + return $this->userSalesVolume->month_TP_points; break; - case 'sales_volume_points_shop': return $this->userSalesVolume->month_shop_points; break; - case 'sales_volume_points_sum': - return $this->userSalesVolume->getPointsSum(); + case 'sales_volume_points_KP_sum': + return $this->userSalesVolume->getPointsKPSum(); break; - + case 'sales_volume_points_TP_sum': + return $this->userSalesVolume->getPointsTPSum(); + break; + //price net case 'sales_volume_total': return $this->userSalesVolume->month_total_net; break; diff --git a/bootstrap/cache/packages.php b/bootstrap/cache/packages.php index 304d2e49..301a4f18 100755 --- a/bootstrap/cache/packages.php +++ b/bootstrap/cache/packages.php @@ -25,6 +25,7 @@ ), 'aliases' => array ( + 'Pdf' => 'Barryvdh\\DomPDF\\Facade\\Pdf', 'PDF' => 'Barryvdh\\DomPDF\\Facade\\Pdf', ), ), diff --git a/composer.lock b/composer.lock index 23e1568c..c6d046b0 100755 --- a/composer.lock +++ b/composer.lock @@ -114,39 +114,40 @@ }, { "name": "barryvdh/laravel-dompdf", - "version": "v1.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-dompdf.git", - "reference": "e3f429e97087b2ef19b83e5ed313f080f2477685" + "reference": "9843d2be423670fb434f4c978b3c0f4dd92c87a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/e3f429e97087b2ef19b83e5ed313f080f2477685", - "reference": "e3f429e97087b2ef19b83e5ed313f080f2477685", + "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/9843d2be423670fb434f4c978b3c0f4dd92c87a6", + "reference": "9843d2be423670fb434f4c978b3c0f4dd92c87a6", "shasum": "" }, "require": { - "dompdf/dompdf": "^1", - "illuminate/support": "^6|^7|^8|^9", + "dompdf/dompdf": "^2.0.1", + "illuminate/support": "^6|^7|^8|^9|^10", "php": "^7.2 || ^8.0" }, "require-dev": { "nunomaduro/larastan": "^1|^2", - "orchestra/testbench": "^4|^5|^6|^7", + "orchestra/testbench": "^4|^5|^6|^7|^8", "phpro/grumphp": "^1", "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" }, "laravel": { "providers": [ "Barryvdh\\DomPDF\\ServiceProvider" ], "aliases": { + "Pdf": "Barryvdh\\DomPDF\\Facade\\Pdf", "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf" } } @@ -174,7 +175,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-dompdf/issues", - "source": "https://github.com/barryvdh/laravel-dompdf/tree/v1.0.0" + "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.0.1" }, "funding": [ { @@ -186,7 +187,7 @@ "type": "github" } ], - "time": "2022-01-29T08:02:59+00:00" + "time": "2023-01-12T15:12:49+00:00" }, { "name": "brick/math", @@ -250,21 +251,21 @@ }, { "name": "cocur/slugify", - "version": "v4.1.0", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/cocur/slugify.git", - "reference": "2611e6081dbbb05837a16ed339c0451923d4046e" + "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cocur/slugify/zipball/2611e6081dbbb05837a16ed339c0451923d4046e", - "reference": "2611e6081dbbb05837a16ed339c0451923d4046e", + "url": "https://api.github.com/repos/cocur/slugify/zipball/652234ef5f1be844a2ae1c36ad1b4c88b05160f9", + "reference": "652234ef5f1be844a2ae1c36ad1b4c88b05160f9", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=7.1" + "php": "^7.1 || ~8.0.0 || ~8.1.0 || ~8.2.0" }, "conflict": { "symfony/config": "<3.4 || >=4,<4.3", @@ -318,9 +319,90 @@ ], "support": { "issues": "https://github.com/cocur/slugify/issues", - "source": "https://github.com/cocur/slugify/tree/v4.1.0" + "source": "https://github.com/cocur/slugify/tree/v4.3.0" }, - "time": "2022-01-11T20:51:10+00:00" + "time": "2022-12-07T19:48:48+00:00" + }, + { + "name": "composer/semver", + "version": "3.3.2", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.4", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.3.2" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-04-01T19:23:25+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -463,27 +545,27 @@ }, { "name": "digital-bird/shoppingcart", - "version": "5.1.1", + "version": "5.1.4", "source": { "type": "git", "url": "https://github.com/digital-bird/LaravelShoppingcart.git", - "reference": "9159fe6d59fc228da6d1ab29bdad130fac84ff8b" + "reference": "9390c78b2d2146672c2d451ab1f929d09da46a3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/digital-bird/LaravelShoppingcart/zipball/9159fe6d59fc228da6d1ab29bdad130fac84ff8b", - "reference": "9159fe6d59fc228da6d1ab29bdad130fac84ff8b", + "url": "https://api.github.com/repos/digital-bird/LaravelShoppingcart/zipball/9390c78b2d2146672c2d451ab1f929d09da46a3e", + "reference": "9390c78b2d2146672c2d451ab1f929d09da46a3e", "shasum": "" }, "require": { - "illuminate/events": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*", - "illuminate/session": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*", - "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*" + "illuminate/events": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|10.*", + "illuminate/session": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|10.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|10.*" }, "require-dev": { "mockery/mockery": "~0.9.0", "orchestra/testbench": "~3.1", - "phpunit/phpunit": "~5.0|~6.0|~7.0|~8.0|~9,0" + "phpunit/phpunit": "~5.0|~6.0|~7.0|~8.0|~9.0|~10.0" }, "suggest": { "gloudemans/notify": "Simple flash notifications for Laravel" @@ -520,22 +602,22 @@ "shoppingcart" ], "support": { - "source": "https://github.com/digital-bird/LaravelShoppingcart/tree/5.1.1" + "source": "https://github.com/digital-bird/LaravelShoppingcart/tree/5.1.4" }, - "time": "2022-01-11T03:53:36+00:00" + "time": "2023-01-17T05:43:33+00:00" }, { "name": "doctrine/cache", - "version": "2.1.1", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce" + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce", - "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce", + "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb", + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb", "shasum": "" }, "require": { @@ -545,18 +627,12 @@ "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "alcaeus/mongo-php-adapter": "^1.1", "cache/integration-tests": "dev-master", - "doctrine/coding-standard": "^8.0", - "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "predis/predis": "~1.0", + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "psr/cache": "^1.0 || ^2.0 || ^3.0", - "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev", - "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" + "symfony/cache": "^4.4 || ^5.4 || ^6", + "symfony/var-exporter": "^4.4 || ^5.4 || ^6" }, "type": "library", "autoload": { @@ -605,7 +681,7 @@ ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/2.1.1" + "source": "https://github.com/doctrine/cache/tree/2.2.0" }, "funding": [ { @@ -621,26 +697,26 @@ "type": "tidelift" } ], - "time": "2021-07-17T14:49:29+00:00" + "time": "2022-05-20T20:07:39+00:00" }, { "name": "doctrine/dbal", - "version": "3.3.2", + "version": "3.3.8", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "35eae239ef515d55ebb24e9d4715cad09a4f58ed" + "reference": "f873a820227bc352d023791775a01f078a30dfe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/35eae239ef515d55ebb24e9d4715cad09a4f58ed", - "reference": "35eae239ef515d55ebb24e9d4715cad09a4f58ed", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/f873a820227bc352d023791775a01f078a30dfe1", + "reference": "f873a820227bc352d023791775a01f078a30dfe1", "shasum": "" }, "require": { "composer-runtime-api": "^2", "doctrine/cache": "^1.11|^2.0", - "doctrine/deprecations": "^0.5.3", + "doctrine/deprecations": "^0.5.3|^1", "doctrine/event-manager": "^1.0", "php": "^7.3 || ^8.0", "psr/cache": "^1|^2|^3", @@ -648,15 +724,15 @@ }, "require-dev": { "doctrine/coding-standard": "9.0.0", - "jetbrains/phpstorm-stubs": "2021.1", - "phpstan/phpstan": "1.4.0", - "phpstan/phpstan-strict-rules": "^1.1", - "phpunit/phpunit": "9.5.11", - "psalm/plugin-phpunit": "0.16.1", - "squizlabs/php_codesniffer": "3.6.2", + "jetbrains/phpstorm-stubs": "2022.1", + "phpstan/phpstan": "1.8.2", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "9.5.21", + "psalm/plugin-phpunit": "0.17.0", + "squizlabs/php_codesniffer": "3.7.1", "symfony/cache": "^5.2|^6.0", "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0", - "vimeo/psalm": "4.16.1" + "vimeo/psalm": "4.24.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -716,7 +792,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.3.2" + "source": "https://github.com/doctrine/dbal/tree/3.3.8" }, "funding": [ { @@ -732,29 +808,29 @@ "type": "tidelift" } ], - "time": "2022-02-05T16:33:45+00:00" + "time": "2022-08-05T15:35:35+00:00" }, { "name": "doctrine/deprecations", - "version": "v0.5.3", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "9504165960a1f83cc1480e2be1dd0a0478561314" + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314", - "reference": "9504165960a1f83cc1480e2be1dd0a0478561314", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", "shasum": "" }, "require": { "php": "^7.1|^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0|^7.0|^8.0", - "phpunit/phpunit": "^7.0|^8.0|^9.0", - "psr/log": "^1.0" + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5|^8.5|^9.5", + "psr/log": "^1|^2|^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -773,43 +849,41 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v0.5.3" + "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" }, - "time": "2021-03-21T12:59:47+00:00" + "time": "2022-05-02T15:47:09+00:00" }, { "name": "doctrine/event-manager", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f" + "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f", - "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520", + "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520", "shasum": "" }, "require": { + "doctrine/deprecations": "^0.5.3 || ^1", "php": "^7.1 || ^8.0" }, "conflict": { - "doctrine/common": "<2.9@dev" + "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpunit/phpunit": "^7.0" + "doctrine/coding-standard": "^9 || ^10", + "phpstan/phpstan": "~1.4.10 || ^1.8.8", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.24" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "Doctrine\\Common\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -853,7 +927,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.1.x" + "source": "https://github.com/doctrine/event-manager/tree/1.2.0" }, "funding": [ { @@ -869,32 +943,32 @@ "type": "tidelift" } ], - "time": "2020-05-29T18:28:51+00:00" + "time": "2022-10-12T20:51:15+00:00" }, { "name": "doctrine/inflector", - "version": "2.0.4", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89" + "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", - "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", + "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "vimeo/psalm": "^4.10" + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25" }, "type": "library", "autoload": { @@ -944,7 +1018,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.4" + "source": "https://github.com/doctrine/inflector/tree/2.0.6" }, "funding": [ { @@ -960,7 +1034,7 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:16:43+00:00" + "time": "2022-10-20T09:10:12+00:00" }, { "name": "doctrine/lexer", @@ -1040,26 +1114,29 @@ }, { "name": "dompdf/dompdf", - "version": "v1.2.0", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "60b704331479a69e9bcdb3496da2315b5c4f94fd" + "reference": "e8d2d5e37e8b0b30f0732a011295ab80680d7e85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/60b704331479a69e9bcdb3496da2315b5c4f94fd", - "reference": "60b704331479a69e9bcdb3496da2315b5c4f94fd", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85", + "reference": "e8d2d5e37e8b0b30f0732a011295ab80680d7e85", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", - "phenx/php-font-lib": "^0.5.4", - "phenx/php-svg-lib": "^0.3.3 || ^0.4.0", + "masterminds/html5": "^2.0", + "phenx/php-font-lib": ">=0.5.4 <1.0.0", + "phenx/php-svg-lib": ">=0.3.3 <1.0.0", "php": "^7.1 || ^8.0" }, "require-dev": { + "ext-json": "*", + "ext-zip": "*", "mockery/mockery": "^1.3", "phpunit/phpunit": "^7.5 || ^8 || ^9", "squizlabs/php_codesniffer": "^3.5" @@ -1085,38 +1162,30 @@ ], "authors": [ { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - }, - { - "name": "Brian Sweeney", - "email": "eclecticgeek@gmail.com" - }, - { - "name": "Gabriel Bull", - "email": "me@gabrielbull.com" + "name": "The Dompdf Community", + "homepage": "https://github.com/dompdf/dompdf/blob/master/AUTHORS.md" } ], "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", "homepage": "https://github.com/dompdf/dompdf", "support": { "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/v1.2.0" + "source": "https://github.com/dompdf/dompdf/tree/v2.0.3" }, - "time": "2022-02-07T13:02:10+00:00" + "time": "2023-02-07T12:51:48+00:00" }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.1", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa" + "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa", - "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8", + "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8", "shasum": "" }, "require": { @@ -1156,7 +1225,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.1" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2" }, "funding": [ { @@ -1164,7 +1233,7 @@ "type": "github" } ], - "time": "2022-01-18T15:43:28+00:00" + "time": "2022-09-10T18:51:20+00:00" }, { "name": "egulias/email-validator", @@ -1236,20 +1305,30 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.14.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" }, "type": "library", "autoload": { @@ -1281,22 +1360,22 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" }, - "time": "2021-12-25T01:21:49+00:00" + "time": "2022-09-18T07:06:19+00:00" }, { "name": "fideloper/proxy", - "version": "4.4.1", + "version": "4.4.2", "source": { "type": "git", "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "c073b2bd04d1c90e04dc1b787662b558dd65ade0" + "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0", - "reference": "c073b2bd04d1c90e04dc1b787662b558dd65ade0", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750", + "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750", "shasum": "" }, "require": { @@ -1306,7 +1385,7 @@ "require-dev": { "illuminate/http": "^5.0|^6.0|^7.0|^8.0|^9.0", "mockery/mockery": "^1.0", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^8.5.8|^9.3.3" }, "type": "library", "extra": { @@ -1339,31 +1418,37 @@ ], "support": { "issues": "https://github.com/fideloper/TrustedProxy/issues", - "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.1" + "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.2" }, - "time": "2020-10-22T13:48:01+00:00" + "time": "2022-02-09T13:33:34+00:00" }, { "name": "firebase/php-jwt", - "version": "v5.5.1", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "83b609028194aa042ea33b5af2d41a7427de80e6" + "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/83b609028194aa042ea33b5af2d41a7427de80e6", - "reference": "83b609028194aa042ea33b5af2d41a7427de80e6", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224", + "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.1||^8.0" }, "require-dev": { - "phpunit/phpunit": ">=4.8 <=9" + "guzzlehttp/guzzle": "^6.5||^7.4", + "phpspec/prophecy-phpunit": "^1.1", + "phpunit/phpunit": "^7.5||^9.5", + "psr/cache": "^1.0||^2.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0" }, "suggest": { + "ext-sodium": "Support EdDSA (Ed25519) signatures", "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" }, "type": "library", @@ -1396,9 +1481,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v5.5.1" + "source": "https://github.com/firebase/php-jwt/tree/v6.4.0" }, - "time": "2021-11-08T20:18:51+00:00" + "time": "2023-02-09T21:01:23+00:00" }, { "name": "fruitcake/laravel-cors", @@ -1477,28 +1562,29 @@ "type": "github" } ], + "abandoned": true, "time": "2022-02-23T14:25:13+00:00" }, { "name": "graham-campbell/result-type", - "version": "v1.0.4", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "0690bde05318336c7221785f2a932467f98b64ca" + "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca", - "reference": "0690bde05318336c7221785f2a932467f98b64ca", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", + "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0", - "phpoption/phpoption": "^1.8" + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.1" }, "require-dev": { - "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" }, "type": "library", "autoload": { @@ -1527,7 +1613,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.1" }, "funding": [ { @@ -1539,26 +1625,26 @@ "type": "tidelift" } ], - "time": "2021-11-21T21:41:47+00:00" + "time": "2023-02-25T20:23:15+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.4.1", + "version": "7.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/psr7": "^1.9 || ^2.4", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1567,10 +1653,10 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -1580,8 +1666,12 @@ }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "7.4-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -1647,7 +1737,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.1" + "source": "https://github.com/guzzle/guzzle/tree/7.5.0" }, "funding": [ { @@ -1663,20 +1753,20 @@ "type": "tidelift" } ], - "time": "2021-12-06T18:43:05+00:00" + "time": "2022-08-28T15:39:27+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "" }, "require": { @@ -1731,7 +1821,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -1747,20 +1837,20 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.1.0", + "version": "2.4.4", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", + "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", "shasum": "" }, "require": { @@ -1774,17 +1864,21 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -1846,7 +1940,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.1.0" + "source": "https://github.com/guzzle/psr7/tree/2.4.4" }, "funding": [ { @@ -1862,20 +1956,20 @@ "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2023-03-09T13:19:02+00:00" }, { "name": "intervention/image", - "version": "2.7.1", + "version": "2.7.2", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "744ebba495319501b873a4e48787759c72e3fb8c" + "reference": "04be355f8d6734c826045d02a1079ad658322dad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/744ebba495319501b873a4e48787759c72e3fb8c", - "reference": "744ebba495319501b873a4e48787759c72e3fb8c", + "url": "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad", + "reference": "04be355f8d6734c826045d02a1079ad658322dad", "shasum": "" }, "require": { @@ -1918,8 +2012,8 @@ "authors": [ { "name": "Oliver Vogel", - "email": "oliver@olivervogel.com", - "homepage": "http://olivervogel.com/" + "email": "oliver@intervention.io", + "homepage": "https://intervention.io/" } ], "description": "Image handling and manipulation library with support for Laravel integration", @@ -1934,11 +2028,11 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/2.7.1" + "source": "https://github.com/Intervention/image/tree/2.7.2" }, "funding": [ { - "url": "https://www.paypal.me/interventionphp", + "url": "https://paypal.me/interventionio", "type": "custom" }, { @@ -1946,7 +2040,7 @@ "type": "github" } ], - "time": "2021-12-16T16:49:26+00:00" + "time": "2022-05-21T17:30:32+00:00" }, { "name": "jenssegers/date", @@ -2027,20 +2121,20 @@ }, { "name": "laracasts/flash", - "version": "3.2.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/laracasts/flash.git", - "reference": "f64a8d97f901fdb3ce8eb9b28c5308a726455467" + "reference": "6330bc3c027d3c03188b41c58133016f8226b8fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laracasts/flash/zipball/f64a8d97f901fdb3ce8eb9b28c5308a726455467", - "reference": "f64a8d97f901fdb3ce8eb9b28c5308a726455467", + "url": "https://api.github.com/repos/laracasts/flash/zipball/6330bc3c027d3c03188b41c58133016f8226b8fb", + "reference": "6330bc3c027d3c03188b41c58133016f8226b8fb", "shasum": "" }, "require": { - "illuminate/support": "~5.0|^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "~5.0|^6.0|^7.0|^8.0|^9.0|^10.0", "php": ">=5.4.0" }, "require-dev": { @@ -2078,23 +2172,22 @@ ], "description": "Easy flash notifications", "support": { - "issues": "https://github.com/laracasts/flash/issues", - "source": "https://github.com/laracasts/flash/tree/3.2.1" + "source": "https://github.com/laracasts/flash/tree/3.2.2" }, - "time": "2022-01-31T16:01:37+00:00" + "time": "2023-01-30T20:31:40+00:00" }, { "name": "laravel/framework", - "version": "v8.83.3", + "version": "v8.83.27", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "b4ed222a188cca74ca9062296e525d26ae54a0ce" + "reference": "e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/b4ed222a188cca74ca9062296e525d26ae54a0ce", - "reference": "b4ed222a188cca74ca9062296e525d26ae54a0ce", + "url": "https://api.github.com/repos/laravel/framework/zipball/e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49", + "reference": "e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49", "shasum": "" }, "require": { @@ -2254,24 +2347,24 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-03-03T15:14:29+00:00" + "time": "2022-12-08T15:28:55+00:00" }, { "name": "laravel/helpers", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/laravel/helpers.git", - "reference": "c28b0ccd799d58564c41a62395ac9511a1e72931" + "reference": "4dd0f9436d3911611622a6ced8329a1710576f60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/helpers/zipball/c28b0ccd799d58564c41a62395ac9511a1e72931", - "reference": "c28b0ccd799d58564c41a62395ac9511a1e72931", + "url": "https://api.github.com/repos/laravel/helpers/zipball/4dd0f9436d3911611622a6ced8329a1710576f60", + "reference": "4dd0f9436d3911611622a6ced8329a1710576f60", "shasum": "" }, "require": { - "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0", "php": "^7.1.3|^8.0" }, "require-dev": { @@ -2308,36 +2401,36 @@ "laravel" ], "support": { - "source": "https://github.com/laravel/helpers/tree/v1.5.0" + "source": "https://github.com/laravel/helpers/tree/v1.6.0" }, - "time": "2022-01-12T15:58:51+00:00" + "time": "2023-01-09T14:48:11+00:00" }, { "name": "laravel/passport", - "version": "v10.3.2", + "version": "v10.4.2", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "c56207e9a37c849da0164842a609a9f38747e95b" + "reference": "4bfdb9610575a0c84a6810701f4fd45fb8ab3888" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/c56207e9a37c849da0164842a609a9f38747e95b", - "reference": "c56207e9a37c849da0164842a609a9f38747e95b", + "url": "https://api.github.com/repos/laravel/passport/zipball/4bfdb9610575a0c84a6810701f4fd45fb8ab3888", + "reference": "4bfdb9610575a0c84a6810701f4fd45fb8ab3888", "shasum": "" }, "require": { "ext-json": "*", - "firebase/php-jwt": "^5.0", - "illuminate/auth": "^8.2|^9.0", - "illuminate/console": "^8.2|^9.0", - "illuminate/container": "^8.2|^9.0", - "illuminate/contracts": "^8.2|^9.0", - "illuminate/cookie": "^8.2|^9.0", - "illuminate/database": "^8.2|^9.0", - "illuminate/encryption": "^8.2|^9.0", - "illuminate/http": "^8.2|^9.0", - "illuminate/support": "^8.2|^9.0", + "firebase/php-jwt": "^6.0", + "illuminate/auth": "^8.37|^9.0", + "illuminate/console": "^8.37|^9.0", + "illuminate/container": "^8.37|^9.0", + "illuminate/contracts": "^8.37|^9.0", + "illuminate/cookie": "^8.37|^9.0", + "illuminate/database": "^8.37|^9.0", + "illuminate/encryption": "^8.37|^9.0", + "illuminate/http": "^8.37|^9.0", + "illuminate/support": "^8.37|^9.0", "lcobucci/jwt": "^3.4|^4.0", "league/oauth2-server": "^8.2", "nyholm/psr7": "^1.3", @@ -2387,29 +2480,30 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2022-02-15T21:44:15+00:00" + "time": "2023-02-21T07:47:20+00:00" }, { "name": "laravel/serializable-closure", - "version": "v1.1.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "9e4b005daa20b0c161f3845040046dc9ddc1d74e" + "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/9e4b005daa20b0c161f3845040046dc9ddc1d74e", - "reference": "9e4b005daa20b0c161f3845040046dc9ddc1d74e", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", + "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", "shasum": "" }, "require": { "php": "^7.3|^8.0" }, "require-dev": { - "pestphp/pest": "^1.18", - "phpstan/phpstan": "^0.12.98", - "symfony/var-dumper": "^5.3" + "nesbot/carbon": "^2.61", + "pestphp/pest": "^1.21.3", + "phpstan/phpstan": "^1.8.2", + "symfony/var-dumper": "^5.4.11" }, "type": "library", "extra": { @@ -2446,26 +2540,26 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2022-02-11T19:23:53+00:00" + "time": "2023-01-30T18:31:20+00:00" }, { "name": "laravel/tinker", - "version": "v2.7.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "5f2f9815b7631b9f586a3de7933c25f9327d4073" + "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/5f2f9815b7631b9f586a3de7933c25f9327d4073", - "reference": "5f2f9815b7631b9f586a3de7933c25f9327d4073", + "url": "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10", + "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10", "shasum": "" }, "require": { - "illuminate/console": "^6.0|^7.0|^8.0|^9.0", - "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0", + "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", "php": "^7.2.5|^8.0", "psy/psysh": "^0.10.4|^0.11.1", "symfony/var-dumper": "^4.3.4|^5.0|^6.0" @@ -2475,7 +2569,7 @@ "phpunit/phpunit": "^8.5.8|^9.3.3" }, "suggest": { - "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0)." + "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)." }, "type": "library", "extra": { @@ -2512,22 +2606,22 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.7.0" + "source": "https://github.com/laravel/tinker/tree/v2.8.1" }, - "time": "2022-01-10T08:52:49+00:00" + "time": "2023-02-15T16:40:09+00:00" }, { "name": "laravel/ui", - "version": "v3.4.5", + "version": "v3.4.6", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "f11d295de1508c5bb56206a620b00b6616de414c" + "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/f11d295de1508c5bb56206a620b00b6616de414c", - "reference": "f11d295de1508c5bb56206a620b00b6616de414c", + "url": "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c", + "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c", "shasum": "" }, "require": { @@ -2573,34 +2667,34 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v3.4.5" + "source": "https://github.com/laravel/ui/tree/v3.4.6" }, - "time": "2022-02-21T14:59:16+00:00" + "time": "2022-05-20T13:38:08+00:00" }, { "name": "laravelcollective/html", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "78c3cb516ac9e6d3d76cad9191f81d217302dea6" + "reference": "ac74f580459a5120079b8def0404e5d312a09504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/78c3cb516ac9e6d3d76cad9191f81d217302dea6", - "reference": "78c3cb516ac9e6d3d76cad9191f81d217302dea6", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/ac74f580459a5120079b8def0404e5d312a09504", + "reference": "ac74f580459a5120079b8def0404e5d312a09504", "shasum": "" }, "require": { - "illuminate/http": "^6.0|^7.0|^8.0|^9.0", - "illuminate/routing": "^6.0|^7.0|^8.0|^9.0", - "illuminate/session": "^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0", - "illuminate/view": "^6.0|^7.0|^8.0|^9.0", + "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0", "php": ">=7.2.5" }, "require-dev": { - "illuminate/database": "^6.0|^7.0|^8.0|^9.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0", "mockery/mockery": "~1.0", "phpunit/phpunit": "~8.5|^9.5.10" }, @@ -2647,7 +2741,7 @@ "issues": "https://github.com/LaravelCollective/html/issues", "source": "https://github.com/LaravelCollective/html" }, - "time": "2022-02-08T21:02:54+00:00" + "time": "2023-02-13T18:15:35+00:00" }, { "name": "lcobucci/jwt", @@ -2875,16 +2969,16 @@ }, { "name": "league/flysystem", - "version": "1.1.9", + "version": "1.1.10", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "094defdb4a7001845300334e7c1ee2335925ef99" + "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99", - "reference": "094defdb4a7001845300334e7c1ee2335925ef99", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3239285c825c152bcc315fe0e87d6b55f5972ed1", + "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1", "shasum": "" }, "require": { @@ -2957,7 +3051,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/1.1.9" + "source": "https://github.com/thephpleague/flysystem/tree/1.1.10" }, "funding": [ { @@ -2965,20 +3059,20 @@ "type": "other" } ], - "time": "2021-12-09T09:40:50+00:00" + "time": "2022-10-04T09:16:37+00:00" }, { "name": "league/mime-type-detection", - "version": "1.9.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69" + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/aa70e813a6ad3d1558fc927863d47309b4c23e69", - "reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", "shasum": "" }, "require": { @@ -3009,7 +3103,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.9.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" }, "funding": [ { @@ -3021,20 +3115,20 @@ "type": "tidelift" } ], - "time": "2021-11-21T11:48:40+00:00" + "time": "2022-04-17T13:12:02+00:00" }, { "name": "league/oauth2-server", - "version": "8.3.3", + "version": "8.4.1", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-server.git", - "reference": "f5698a3893eda9a17bcd48636990281e7ca77b2a" + "reference": "eed31d86d8cc8e6e9c9f58fbb2113494f8b41e24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/f5698a3893eda9a17bcd48636990281e7ca77b2a", - "reference": "f5698a3893eda9a17bcd48636990281e7ca77b2a", + "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/eed31d86d8cc8e6e9c9f58fbb2113494f8b41e24", + "reference": "eed31d86d8cc8e6e9c9f58fbb2113494f8b41e24", "shasum": "" }, "require": { @@ -3043,6 +3137,7 @@ "ext-openssl": "*", "lcobucci/jwt": "^3.4.6 || ^4.0.4", "league/event": "^2.2", + "league/uri": "^6.4", "php": "^7.2 || ^8.0", "psr/http-message": "^1.0.1" }, @@ -3100,7 +3195,7 @@ ], "support": { "issues": "https://github.com/thephpleague/oauth2-server/issues", - "source": "https://github.com/thephpleague/oauth2-server/tree/8.3.3" + "source": "https://github.com/thephpleague/oauth2-server/tree/8.4.1" }, "funding": [ { @@ -3108,30 +3203,199 @@ "type": "github" } ], - "time": "2021-10-11T20:41:49+00:00" + "time": "2023-03-22T11:47:53+00:00" }, { - "name": "maatwebsite/excel", - "version": "3.1.37", + "name": "league/uri", + "version": "6.5.0", "source": { "type": "git", - "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "49ccd4142d3d7bce492d6bfb9dd9a27b12935408" + "url": "https://github.com/thephpleague/uri.git", + "reference": "c68ca445abb04817d740ddd6d0b3551826ef0c5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/49ccd4142d3d7bce492d6bfb9dd9a27b12935408", - "reference": "49ccd4142d3d7bce492d6bfb9dd9a27b12935408", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/c68ca445abb04817d740ddd6d0b3551826ef0c5a", + "reference": "c68ca445abb04817d740ddd6d0b3551826ef0c5a", "shasum": "" }, "require": { "ext-json": "*", - "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0", - "php": "^7.0|^8.0", - "phpoffice/phpspreadsheet": "^1.18" + "league/uri-interfaces": "^2.3", + "php": "^7.3 || ^8.0", + "psr/http-message": "^1.0" + }, + "conflict": { + "league/uri-schemes": "^1.0" }, "require-dev": { - "orchestra/testbench": "^6.0|^7.0", + "friendsofphp/php-cs-fixer": "^2.19 || ^3.0", + "phpstan/phpstan": "^0.12.90", + "phpstan/phpstan-phpunit": "^0.12.22", + "phpstan/phpstan-strict-rules": "^0.12.11", + "phpunit/phpunit": "^8.0 || ^9.0", + "psr/http-factory": "^1.0" + }, + "suggest": { + "ext-fileinfo": "Needed to create Data URI from a filepath", + "ext-intl": "Needed to improve host validation", + "league/uri-components": "Needed to easily manipulate URI objects", + "psr/http-factory": "Needed to use the URI factory" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.x-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Uri\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ignace Nyamagana Butera", + "email": "nyamsprod@gmail.com", + "homepage": "https://nyamsprod.com" + } + ], + "description": "URI manipulation library", + "homepage": "http://uri.thephpleague.com", + "keywords": [ + "data-uri", + "file-uri", + "ftp", + "hostname", + "http", + "https", + "middleware", + "parse_str", + "parse_url", + "psr-7", + "query-string", + "querystring", + "rfc3986", + "rfc3987", + "rfc6570", + "uri", + "uri-template", + "url", + "ws" + ], + "support": { + "docs": "https://uri.thephpleague.com", + "forum": "https://thephpleague.slack.com", + "issues": "https://github.com/thephpleague/uri/issues", + "source": "https://github.com/thephpleague/uri/tree/6.5.0" + }, + "funding": [ + { + "url": "https://github.com/sponsors/nyamsprod", + "type": "github" + } + ], + "time": "2021-08-27T09:54:07+00:00" + }, + { + "name": "league/uri-interfaces", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/uri-interfaces.git", + "reference": "00e7e2943f76d8cb50c7dfdc2f6dee356e15e383" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/00e7e2943f76d8cb50c7dfdc2f6dee356e15e383", + "reference": "00e7e2943f76d8cb50c7dfdc2f6dee356e15e383", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.19", + "phpstan/phpstan": "^0.12.90", + "phpstan/phpstan-phpunit": "^0.12.19", + "phpstan/phpstan-strict-rules": "^0.12.9", + "phpunit/phpunit": "^8.5.15 || ^9.5" + }, + "suggest": { + "ext-intl": "to use the IDNA feature", + "symfony/intl": "to use the IDNA feature via Symfony Polyfill" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Uri\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ignace Nyamagana Butera", + "email": "nyamsprod@gmail.com", + "homepage": "https://nyamsprod.com" + } + ], + "description": "Common interface for URI representation", + "homepage": "http://github.com/thephpleague/uri-interfaces", + "keywords": [ + "rfc3986", + "rfc3987", + "uri", + "url" + ], + "support": { + "issues": "https://github.com/thephpleague/uri-interfaces/issues", + "source": "https://github.com/thephpleague/uri-interfaces/tree/2.3.0" + }, + "funding": [ + { + "url": "https://github.com/sponsors/nyamsprod", + "type": "github" + } + ], + "time": "2021-06-28T04:27:21+00:00" + }, + { + "name": "maatwebsite/excel", + "version": "3.1.48", + "source": { + "type": "git", + "url": "https://github.com/SpartnerNL/Laravel-Excel.git", + "reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/6d0fe2a1d195960c7af7bf0de760582da02a34b9", + "reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9", + "shasum": "" + }, + "require": { + "composer/semver": "^3.3", + "ext-json": "*", + "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", + "php": "^7.0|^8.0", + "phpoffice/phpspreadsheet": "^1.18", + "psr/simple-cache": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "orchestra/testbench": "^6.0|^7.0|^8.0", "predis/predis": "^1.1" }, "type": "library", @@ -3174,7 +3438,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.37" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.48" }, "funding": [ { @@ -3186,7 +3450,7 @@ "type": "github" } ], - "time": "2022-02-28T10:20:04+00:00" + "time": "2023-02-22T21:01:38+00:00" }, { "name": "maennchen/zipstream-php", @@ -3249,9 +3513,13 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/master" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.1.0" }, "funding": [ + { + "url": "https://github.com/maennchen", + "type": "github" + }, { "url": "https://opencollective.com/zipstream", "type": "open_collective" @@ -3261,26 +3529,26 @@ }, { "name": "markbaker/complex", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPComplex.git", - "reference": "ab8bc271e404909db09ff2d5ffa1e538085c0f22" + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/ab8bc271e404909db09ff2d5ffa1e538085c0f22", - "reference": "ab8bc271e404909db09ff2d5ffa1e538085c0f22", + "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "phpcompatibility/php-compatibility": "^9.0", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3", - "squizlabs/php_codesniffer": "^3.4" + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { @@ -3306,36 +3574,36 @@ ], "support": { "issues": "https://github.com/MarkBaker/PHPComplex/issues", - "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.1" + "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2" }, - "time": "2021-06-29T15:32:53+00:00" + "time": "2022-12-06T16:21:08+00:00" }, { "name": "markbaker/matrix", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPMatrix.git", - "reference": "c66aefcafb4f6c269510e9ac46b82619a904c576" + "reference": "728434227fe21be27ff6d86621a1b13107a2562c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/c66aefcafb4f6c269510e9ac46b82619a904c576", - "reference": "c66aefcafb4f6c269510e9ac46b82619a904c576", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c", + "reference": "728434227fe21be27ff6d86621a1b13107a2562c", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "phpcompatibility/php-compatibility": "^9.0", + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", "phpdocumentor/phpdocumentor": "2.*", "phploc/phploc": "^4.0", "phpmd/phpmd": "2.*", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "sebastian/phpcpd": "^4.0", - "squizlabs/php_codesniffer": "^3.4" + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { @@ -3362,22 +3630,91 @@ ], "support": { "issues": "https://github.com/MarkBaker/PHPMatrix/issues", - "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.0" + "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1" }, - "time": "2021-07-01T19:01:15+00:00" + "time": "2022-12-02T22:17:43+00:00" }, { - "name": "monolog/monolog", - "version": "2.3.5", + "name": "masterminds/html5", + "version": "2.7.6", "source": { "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd4380d6fc37626e2f799f29d91195040137eba9" + "url": "https://github.com/Masterminds/html5-php.git", + "reference": "897eb517a343a2281f11bc5556d6548db7d93947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9", - "reference": "fd4380d6fc37626e2f799f29d91195040137eba9", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947", + "reference": "897eb517a343a2281f11bc5556d6548db7d93947", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-dom": "*", + "ext-libxml": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Masterminds\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Butcher", + "email": "technosophos@gmail.com" + }, + { + "name": "Matt Farina", + "email": "matt@mattfarina.com" + }, + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + } + ], + "description": "An HTML5 parser and serializer.", + "homepage": "http://masterminds.github.io/html5-php", + "keywords": [ + "HTML5", + "dom", + "html", + "parser", + "querypath", + "serializer", + "xml" + ], + "support": { + "issues": "https://github.com/Masterminds/html5-php/issues", + "source": "https://github.com/Masterminds/html5-php/tree/2.7.6" + }, + "time": "2022-08-18T16:18:26+00:00" + }, + { + "name": "monolog/monolog", + "version": "2.9.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1", + "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1", "shasum": "" }, "require": { @@ -3390,18 +3727,22 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "elasticsearch/elasticsearch": "^7", - "graylog2/gelf-php": "^1.4.2", + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", + "guzzlehttp/guzzle": "^7.4", + "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "php-console/php-console": "^3.1.3", - "phpspec/prophecy": "^1.6.1", + "phpspec/prophecy": "^1.15", "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5", - "predis/predis": "^1.1", - "rollbar/rollbar": "^1.3", - "ruflin/elastica": ">=0.90@dev", - "swiftmailer/swiftmailer": "^5.3|^6.0" + "phpunit/phpunit": "^8.5.14", + "predis/predis": "^1.1 || ^2.0", + "rollbar/rollbar": "^1.3 || ^2 || ^3", + "ruflin/elastica": "^7", + "swiftmailer/swiftmailer": "^5.3|^6.0", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", @@ -3416,7 +3757,6 @@ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, @@ -3451,7 +3791,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.3.5" + "source": "https://github.com/Seldaek/monolog/tree/2.9.1" }, "funding": [ { @@ -3463,20 +3803,20 @@ "type": "tidelift" } ], - "time": "2021-10-01T21:08:31+00:00" + "time": "2023-02-06T13:44:46+00:00" }, { "name": "myclabs/php-enum", - "version": "1.8.3", + "version": "1.8.4", "source": { "type": "git", "url": "https://github.com/myclabs/php-enum.git", - "reference": "b942d263c641ddb5190929ff840c68f78713e937" + "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/php-enum/zipball/b942d263c641ddb5190929ff840c68f78713e937", - "reference": "b942d263c641ddb5190929ff840c68f78713e937", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483", + "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483", "shasum": "" }, "require": { @@ -3492,7 +3832,10 @@ "autoload": { "psr-4": { "MyCLabs\\Enum\\": "src/" - } + }, + "classmap": [ + "stubs/Stringable.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3511,7 +3854,7 @@ ], "support": { "issues": "https://github.com/myclabs/php-enum/issues", - "source": "https://github.com/myclabs/php-enum/tree/1.8.3" + "source": "https://github.com/myclabs/php-enum/tree/1.8.4" }, "funding": [ { @@ -3523,20 +3866,20 @@ "type": "tidelift" } ], - "time": "2021-07-05T08:18:36+00:00" + "time": "2022-08-04T09:53:51+00:00" }, { "name": "nesbot/carbon", - "version": "2.57.0", + "version": "2.66.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "4a54375c21eea4811dbd1149fe6b246517554e78" + "reference": "496712849902241f04902033b0441b269effe001" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4a54375c21eea4811dbd1149fe6b246517554e78", - "reference": "4a54375c21eea4811dbd1149fe6b246517554e78", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001", + "reference": "496712849902241f04902033b0441b269effe001", "shasum": "" }, "require": { @@ -3547,14 +3890,16 @@ "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { - "doctrine/dbal": "^2.0 || ^3.0", + "doctrine/dbal": "^2.0 || ^3.1.4", "doctrine/orm": "^2.7", "friendsofphp/php-cs-fixer": "^3.0", "kylekatarnls/multi-tester": "^2.0", + "ondrejmirtes/better-reflection": "*", "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.54 || ^1.0", - "phpunit/phpunit": "^7.5.20 || ^8.5.14", + "phpstan/phpstan": "^0.12.99 || ^1.7.14", + "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6", + "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20", "squizlabs/php_codesniffer": "^3.4" }, "bin": [ @@ -3611,28 +3956,32 @@ }, "funding": [ { - "url": "https://opencollective.com/Carbon", - "type": "open_collective" + "url": "https://github.com/sponsors/kylekatarnls", + "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "url": "https://opencollective.com/Carbon#sponsor", + "type": "opencollective" + }, + { + "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme", "type": "tidelift" } ], - "time": "2022-02-13T18:13:33+00:00" + "time": "2023-01-29T18:53:47+00:00" }, { "name": "nikic/php-parser", - "version": "v4.13.2", + "version": "v4.15.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", "shasum": "" }, "require": { @@ -3673,22 +4022,22 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" }, - "time": "2021-11-30T19:35:32+00:00" + "time": "2023-03-05T19:49:14+00:00" }, { "name": "nyholm/psr7", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/Nyholm/psr7.git", - "reference": "1461e07a0f2a975a52082ca3b769ca912b816226" + "reference": "bf4aebd170fadf5fd808c70b90535de327e81a50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Nyholm/psr7/zipball/1461e07a0f2a975a52082ca3b769ca912b816226", - "reference": "1461e07a0f2a975a52082ca3b769ca912b816226", + "url": "https://api.github.com/repos/Nyholm/psr7/zipball/bf4aebd170fadf5fd808c70b90535de327e81a50", + "reference": "bf4aebd170fadf5fd808c70b90535de327e81a50", "shasum": "" }, "require": { @@ -3698,6 +4047,7 @@ "psr/http-message": "^1.0" }, "provide": { + "php-http/message-factory-implementation": "1.0", "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, @@ -3710,7 +4060,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -3740,7 +4090,7 @@ ], "support": { "issues": "https://github.com/Nyholm/psr7/issues", - "source": "https://github.com/Nyholm/psr7/tree/1.5.0" + "source": "https://github.com/Nyholm/psr7/tree/1.6.0" }, "funding": [ { @@ -3752,7 +4102,7 @@ "type": "github" } ], - "time": "2022-02-02T18:37:57+00:00" + "time": "2023-04-09T08:34:27+00:00" }, { "name": "opis/closure", @@ -3821,16 +4171,16 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.5.0", + "version": "v2.6.3", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8" + "reference": "58c3f47f650c94ec05a151692652a868995d2938" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/9229e15f2e6ba772f0c55dd6986c563b937170a8", - "reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938", + "reference": "58c3f47f650c94ec05a151692652a868995d2938", "shasum": "" }, "require": { @@ -3884,7 +4234,7 @@ "issues": "https://github.com/paragonie/constant_time_encoding/issues", "source": "https://github.com/paragonie/constant_time_encoding" }, - "time": "2022-01-17T05:32:27+00:00" + "time": "2022-06-14T06:56:20+00:00" }, { "name": "paragonie/random_compat", @@ -3982,23 +4332,25 @@ }, { "name": "phenx/php-svg-lib", - "version": "v0.3.3", + "version": "0.5.0", "source": { "type": "git", - "url": "https://github.com/PhenX/php-svg-lib.git", - "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32" + "url": "https://github.com/dompdf/php-svg-lib.git", + "reference": "76876c6cf3080bcb6f249d7d59705108166a6685" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", - "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", + "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685", + "reference": "76876c6cf3080bcb6f249d7d59705108166a6685", "shasum": "" }, "require": { - "sabberworm/php-css-parser": "^8.3" + "ext-mbstring": "*", + "php": "^7.1 || ^8.0", + "sabberworm/php-css-parser": "^8.4" }, "require-dev": { - "phpunit/phpunit": "^5.5|^6.5" + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5" }, "type": "library", "autoload": { @@ -4019,10 +4371,10 @@ "description": "A library to read, parse and export to PDF SVG files.", "homepage": "https://github.com/PhenX/php-svg-lib", "support": { - "issues": "https://github.com/PhenX/php-svg-lib/issues", - "source": "https://github.com/PhenX/php-svg-lib/tree/master" + "issues": "https://github.com/dompdf/php-svg-lib/issues", + "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.0" }, - "time": "2019-09-11T20:02:13+00:00" + "time": "2022-09-06T12:16:56+00:00" }, { "name": "php-http/message-factory", @@ -4080,16 +4432,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.22.0", + "version": "1.25.2", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "3a9e29b4f386a08a151a33578e80ef1747037a48" + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/3a9e29b4f386a08a151a33578e80ef1747037a48", - "reference": "3a9e29b4f386a08a151a33578e80ef1747037a48", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5", "shasum": "" }, "require": { @@ -4106,33 +4458,34 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", - "ezyang/htmlpurifier": "^4.13", + "ezyang/htmlpurifier": "^4.15", "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", "php": "^7.3 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/simple-cache": "^1.0" + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-master", - "dompdf/dompdf": "^1.0", + "dompdf/dompdf": "^1.0 || ^2.0", "friendsofphp/php-cs-fixer": "^3.2", - "jpgraph/jpgraph": "^4.0", - "mpdf/mpdf": "8.0.17", + "mitoteam/jpgraph": "10.2.4", + "mpdf/mpdf": "8.1.1", "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^8.5 || ^9.0", - "squizlabs/php_codesniffer": "^3.6", - "tecnickcom/tcpdf": "^6.4" + "squizlabs/php_codesniffer": "^3.7", + "tecnickcom/tcpdf": "6.5" }, "suggest": { - "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)", - "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "ext-intl": "PHP Internationalization Functions", + "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", "mpdf/mpdf": "Option for rendering PDF with PDF Writer", - "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)" + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" }, "type": "library", "autoload": { @@ -4178,35 +4531,39 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.22.0" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2" }, - "time": "2022-02-18T12:57:07+00:00" + "time": "2022-09-25T17:21:01+00:00" }, { "name": "phpoption/phpoption", - "version": "1.8.1", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" + "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", - "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e", + "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -4239,7 +4596,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.1" }, "funding": [ { @@ -4251,20 +4608,20 @@ "type": "tidelift" } ], - "time": "2021-12-04T23:24:31+00:00" + "time": "2023-02-25T19:38:58+00:00" }, { "name": "phpseclib/phpseclib", - "version": "3.0.13", + "version": "3.0.19", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e" + "reference": "cc181005cf548bfd8a4896383bb825d859259f95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/1443ab79364eea48665fa8c09ac67f37d1025f7e", - "reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95", + "reference": "cc181005cf548bfd8a4896383bb825d859259f95", "shasum": "" }, "require": { @@ -4273,11 +4630,10 @@ "php": ">=5.6.1" }, "require-dev": { - "phing/phing": "~2.7", - "phpunit/phpunit": "^5.7|^6.0|^9.4", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "*" }, "suggest": { + "ext-dom": "Install the DOM extension to load XML formatted public keys.", "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", @@ -4346,7 +4702,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.13" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.19" }, "funding": [ { @@ -4362,7 +4718,7 @@ "type": "tidelift" } ], - "time": "2022-01-30T08:50:05+00:00" + "time": "2023-03-05T17:13:09+00:00" }, { "name": "psr/cache", @@ -4513,21 +4869,21 @@ }, { "name": "psr/http-client", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -4547,7 +4903,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -4559,27 +4915,27 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/master" + "source": "https://github.com/php-fig/http-client/tree/1.0.2" }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2023-04-10T20:12:12+00:00" }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -4599,7 +4955,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -4614,31 +4970,31 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -4667,9 +5023,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -4774,16 +5130,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.2", + "version": "v0.11.15", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "7f7da640d68b9c9fec819caae7c744a213df6514" + "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514", - "reference": "7f7da640d68b9c9fec819caae7c744a213df6514", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5350ce0ec8ecf2c5b5cf554cd2496f97b444af85", + "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85", "shasum": "" }, "require": { @@ -4798,15 +5154,13 @@ "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.2", - "hoa/console": "3.17.05.02" + "bamarni/composer-bin-plugin": "^1.2" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", - "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." + "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." }, "bin": [ "bin/psysh" @@ -4846,9 +5200,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.2" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.15" }, - "time": "2022-02-28T15:28:54+00:00" + "time": "2023-04-07T21:57:09+00:00" }, { "name": "ralouphie/getallheaders", @@ -5073,16 +5427,16 @@ }, { "name": "reliese/laravel", - "version": "v1.1.4", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/reliese/laravel.git", - "reference": "e016b56015e217802b41ef59852524608272b6f0" + "reference": "b283b30b73aba472c006749e6af7700aa541bab3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reliese/laravel/zipball/e016b56015e217802b41ef59852524608272b6f0", - "reference": "e016b56015e217802b41ef59852524608272b6f0", + "url": "https://api.github.com/repos/reliese/laravel/zipball/b283b30b73aba472c006749e6af7700aa541bab3", + "reference": "b283b30b73aba472c006749e6af7700aa541bab3", "shasum": "" }, "require": { @@ -5132,7 +5486,7 @@ "issues": "https://github.com/reliese/laravel/issues", "source": "https://github.com/reliese/laravel" }, - "time": "2022-02-23T02:45:15+00:00" + "time": "2023-04-04T11:47:25+00:00" }, { "name": "rguedes/pdfmerger", @@ -5239,16 +5593,16 @@ }, { "name": "setasign/fpdf", - "version": "1.8.4", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/Setasign/FPDF.git", - "reference": "b0ddd9c5b98ced8230ef38534f6f3c17308a7974" + "reference": "f4104a04c9a3f95c4c26a0a0531abebcc980987a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDF/zipball/b0ddd9c5b98ced8230ef38534f6f3c17308a7974", - "reference": "b0ddd9c5b98ced8230ef38534f6f3c17308a7974", + "url": "https://api.github.com/repos/Setasign/FPDF/zipball/f4104a04c9a3f95c4c26a0a0531abebcc980987a", + "reference": "f4104a04c9a3f95c4c26a0a0531abebcc980987a", "shasum": "" }, "require": { @@ -5279,22 +5633,22 @@ "pdf" ], "support": { - "source": "https://github.com/Setasign/FPDF/tree/1.8.4" + "source": "https://github.com/Setasign/FPDF/tree/1.8.5" }, - "time": "2021-08-30T07:50:06+00:00" + "time": "2022-11-18T07:02:00+00:00" }, { "name": "setasign/fpdi", - "version": "v2.3.6", + "version": "v2.3.7", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "6231e315f73e4f62d72b73f3d6d78ff0eed93c31" + "reference": "bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/6231e315f73e4f62d72b73f3d6d78ff0eed93c31", - "reference": "6231e315f73e4f62d72b73f3d6d78ff0eed93c31", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05", + "reference": "bccc892d5fa1f48c43f8ba7db5ed4ba6f30c8c05", "shasum": "" }, "require": { @@ -5345,7 +5699,7 @@ ], "support": { "issues": "https://github.com/Setasign/FPDI/issues", - "source": "https://github.com/Setasign/FPDI/tree/v2.3.6" + "source": "https://github.com/Setasign/FPDI/tree/v2.3.7" }, "funding": [ { @@ -5353,7 +5707,7 @@ "type": "tidelift" } ], - "time": "2021-02-11T11:37:01+00:00" + "time": "2023-02-09T10:38:43+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -5433,16 +5787,16 @@ }, { "name": "symfony/console", - "version": "v5.4.5", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad" + "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d8111acc99876953f52fe16d4c50eb60940d49ad", - "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad", + "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8", + "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8", "shasum": "" }, "require": { @@ -5507,12 +5861,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.5" + "source": "https://github.com/symfony/console/tree/v5.4.22" }, "funding": [ { @@ -5528,20 +5882,20 @@ "type": "tidelift" } ], - "time": "2022-02-24T12:45:35+00:00" + "time": "2023-03-25T09:27:28+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.3", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "b0a190285cd95cb019237851205b8140ef6e368e" + "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e", - "reference": "b0a190285cd95cb019237851205b8140ef6e368e", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/95f3c7468db1da8cc360b24fa2a26e7cefcb355d", + "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d", "shasum": "" }, "require": { @@ -5578,7 +5932,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.3" + "source": "https://github.com/symfony/css-selector/tree/v5.4.21" }, "funding": [ { @@ -5594,20 +5948,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { @@ -5645,7 +5999,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -5661,20 +6015,20 @@ "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/error-handler", - "version": "v5.4.3", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "c4ffc2cd919950d13c8c9ce32a70c70214c3ffc5" + "reference": "56a94aa8cb5a5fbc411551d8d014a296b5456549" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/c4ffc2cd919950d13c8c9ce32a70c70214c3ffc5", - "reference": "c4ffc2cd919950d13c8c9ce32a70c70214c3ffc5", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/56a94aa8cb5a5fbc411551d8d014a296b5456549", + "reference": "56a94aa8cb5a5fbc411551d8d014a296b5456549", "shasum": "" }, "require": { @@ -5716,7 +6070,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.4.3" + "source": "https://github.com/symfony/error-handler/tree/v5.4.21" }, "funding": [ { @@ -5732,20 +6086,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-02-14T08:03:56+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.3", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d" + "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d", - "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f", + "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f", "shasum": "" }, "require": { @@ -5801,7 +6155,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22" }, "funding": [ { @@ -5817,20 +6171,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-03-17T11:31:58+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a" + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", - "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", "shasum": "" }, "require": { @@ -5880,7 +6234,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" }, "funding": [ { @@ -5896,20 +6250,20 @@ "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/finder", - "version": "v5.4.3", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d" + "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d", - "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d", + "url": "https://api.github.com/repos/symfony/finder/zipball/078e9a5e1871fcfe6a5ce421b539344c21afef19", + "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19", "shasum": "" }, "require": { @@ -5943,7 +6297,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.3" + "source": "https://github.com/symfony/finder/tree/v5.4.21" }, "funding": [ { @@ -5959,20 +6313,20 @@ "type": "tidelift" } ], - "time": "2022-01-26T16:34:36+00:00" + "time": "2023-02-16T09:33:00+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.6", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "34e89bc147633c0f9dd6caaaf56da3b806a21465" + "reference": "05cd1acdd0e3ce8473aaba1d86c188321d85f313" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/34e89bc147633c0f9dd6caaaf56da3b806a21465", - "reference": "34e89bc147633c0f9dd6caaaf56da3b806a21465", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/05cd1acdd0e3ce8473aaba1d86c188321d85f313", + "reference": "05cd1acdd0e3ce8473aaba1d86c188321d85f313", "shasum": "" }, "require": { @@ -5984,8 +6338,11 @@ "require-dev": { "predis/predis": "~1.0", "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/mime": "^4.4|^5.0|^6.0" + "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/rate-limiter": "^5.2|^6.0" }, "suggest": { "symfony/mime": "To use the file extension guesser" @@ -6016,7 +6373,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.6" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.22" }, "funding": [ { @@ -6032,20 +6389,20 @@ "type": "tidelift" } ], - "time": "2022-03-05T21:03:43+00:00" + "time": "2023-03-28T07:28:17+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.6", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "d41f29ae9af1b5f40c7ebcddf09082953229411d" + "reference": "2d3a8be2c756353627398827c409af6f126c096d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d41f29ae9af1b5f40c7ebcddf09082953229411d", - "reference": "d41f29ae9af1b5f40c7ebcddf09082953229411d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2d3a8be2c756353627398827c409af6f126c096d", + "reference": "2d3a8be2c756353627398827c409af6f126c096d", "shasum": "" }, "require": { @@ -6054,7 +6411,7 @@ "symfony/deprecation-contracts": "^2.1|^3", "symfony/error-handler": "^4.4|^5.0|^6.0", "symfony/event-dispatcher": "^5.0|^6.0", - "symfony/http-foundation": "^5.3.7|^6.0", + "symfony/http-foundation": "^5.4.21|^6.2.7", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16" @@ -6128,7 +6485,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.6" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.22" }, "funding": [ { @@ -6144,20 +6501,20 @@ "type": "tidelift" } ], - "time": "2022-03-05T21:14:51+00:00" + "time": "2023-03-31T11:54:37+00:00" }, { "name": "symfony/mime", - "version": "v5.4.3", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "e1503cfb5c9a225350f549d3bb99296f4abfb80f" + "reference": "ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/e1503cfb5c9a225350f549d3bb99296f4abfb80f", - "reference": "e1503cfb5c9a225350f549d3bb99296f4abfb80f", + "url": "https://api.github.com/repos/symfony/mime/zipball/ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd", + "reference": "ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd", "shasum": "" }, "require": { @@ -6171,15 +6528,16 @@ "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", - "symfony/mailer": "<4.4" + "symfony/mailer": "<4.4", + "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" }, "require-dev": { - "egulias/email-validator": "^2.1.10|^3.1", + "egulias/email-validator": "^2.1.10|^3.1|^4", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.2|^6.0" + "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" }, "type": "library", "autoload": { @@ -6211,7 +6569,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.3" + "source": "https://github.com/symfony/mime/tree/v5.4.21" }, "funding": [ { @@ -6227,20 +6585,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-02-21T19:46:44+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -6255,7 +6613,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6293,7 +6651,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -6309,20 +6667,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40" + "reference": "927013f3aac555983a5059aada98e1907d842695" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40", - "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", + "reference": "927013f3aac555983a5059aada98e1907d842695", "shasum": "" }, "require": { @@ -6337,7 +6695,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6376,7 +6734,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" }, "funding": [ { @@ -6392,20 +6750,20 @@ "type": "tidelift" } ], - "time": "2022-01-04T09:04:05+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", - "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -6417,7 +6775,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6457,7 +6815,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -6473,20 +6831,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T21:10:46+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44" + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", - "reference": "749045c69efb97c70d25d7463abba812e91f3a44", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { @@ -6500,7 +6858,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6544,7 +6902,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" }, "funding": [ { @@ -6560,20 +6918,20 @@ "type": "tidelift" } ], - "time": "2021-09-14T14:02:44+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -6585,7 +6943,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6628,7 +6986,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -6644,20 +7002,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -6672,7 +7030,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6711,7 +7069,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -6727,20 +7085,20 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { @@ -6749,7 +7107,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6787,7 +7145,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" }, "funding": [ { @@ -6803,20 +7161,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", - "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -6825,7 +7183,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6866,7 +7224,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -6882,20 +7240,20 @@ "type": "tidelift" } ], - "time": "2021-06-05T21:20:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", - "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -6904,7 +7262,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6949,7 +7307,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -6965,20 +7323,20 @@ "type": "tidelift" } ], - "time": "2022-03-04T08:16:47+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.25.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", - "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", "shasum": "" }, "require": { @@ -6987,7 +7345,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7028,7 +7386,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" }, "funding": [ { @@ -7044,20 +7402,20 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:11+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", - "version": "v5.4.5", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "95440409896f90a5f85db07a32b517ecec17fa4c" + "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/95440409896f90a5f85db07a32b517ecec17fa4c", - "reference": "95440409896f90a5f85db07a32b517ecec17fa4c", + "url": "https://api.github.com/repos/symfony/process/zipball/4b850da0cc3a2a9181c1ed407adbca4733dc839b", + "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b", "shasum": "" }, "require": { @@ -7090,7 +7448,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.5" + "source": "https://github.com/symfony/process/tree/v5.4.22" }, "funding": [ { @@ -7106,20 +7464,20 @@ "type": "tidelift" } ], - "time": "2022-01-30T18:16:22+00:00" + "time": "2023-03-06T21:29:33+00:00" }, { "name": "symfony/psr-http-message-bridge", - "version": "v2.1.2", + "version": "v2.1.4", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34" + "reference": "a125b93ef378c492e274f217874906fb9babdebb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34", - "reference": "22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/a125b93ef378c492e274f217874906fb9babdebb", + "reference": "a125b93ef378c492e274f217874906fb9babdebb", "shasum": "" }, "require": { @@ -7178,7 +7536,7 @@ ], "support": { "issues": "https://github.com/symfony/psr-http-message-bridge/issues", - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.2" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.4" }, "funding": [ { @@ -7194,20 +7552,20 @@ "type": "tidelift" } ], - "time": "2021-11-05T13:13:39+00:00" + "time": "2022-11-28T22:46:34+00:00" }, { "name": "symfony/routing", - "version": "v5.4.3", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "44b29c7a94e867ccde1da604792f11a469958981" + "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/44b29c7a94e867ccde1da604792f11a469958981", - "reference": "44b29c7a94e867ccde1da604792f11a469958981", + "url": "https://api.github.com/repos/symfony/routing/zipball/c2ac11eb34947999b7c38fb4c835a57306907e6d", + "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d", "shasum": "" }, "require": { @@ -7222,7 +7580,7 @@ "symfony/yaml": "<4.4" }, "require-dev": { - "doctrine/annotations": "^1.12", + "doctrine/annotations": "^1.12|^2", "psr/log": "^1|^2|^3", "symfony/config": "^5.3|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", @@ -7268,7 +7626,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v5.4.3" + "source": "https://github.com/symfony/routing/tree/v5.4.22" }, "funding": [ { @@ -7284,26 +7642,26 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-03-14T14:59:20+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { "php": ">=7.2.5", "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1" + "symfony/deprecation-contracts": "^2.1|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -7351,7 +7709,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -7367,20 +7725,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T16:48:04+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/string", - "version": "v5.4.3", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10" + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10", - "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10", + "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", "shasum": "" }, "require": { @@ -7437,7 +7795,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.3" + "source": "https://github.com/symfony/string/tree/v5.4.22" }, "funding": [ { @@ -7453,20 +7811,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-03-14T06:11:53+00:00" }, { "name": "symfony/translation", - "version": "v5.4.6", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a7ca9fdfffb0174209440c2ffa1dee228e15d95b" + "reference": "9a401392f01bc385aa42760eff481d213a0cc2ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a7ca9fdfffb0174209440c2ffa1dee228e15d95b", - "reference": "a7ca9fdfffb0174209440c2ffa1dee228e15d95b", + "url": "https://api.github.com/repos/symfony/translation/zipball/9a401392f01bc385aa42760eff481d213a0cc2ba", + "reference": "9a401392f01bc385aa42760eff481d213a0cc2ba", "shasum": "" }, "require": { @@ -7534,7 +7892,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.6" + "source": "https://github.com/symfony/translation/tree/v5.4.22" }, "funding": [ { @@ -7550,20 +7908,20 @@ "type": "tidelift" } ], - "time": "2022-03-02T12:56:28+00:00" + "time": "2023-03-27T16:07:23+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.5.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e" + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e", - "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", "shasum": "" }, "require": { @@ -7612,7 +7970,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" }, "funding": [ { @@ -7628,20 +7986,20 @@ "type": "tidelift" } ], - "time": "2021-08-17T14:20:01+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.6", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "294e9da6e2e0dd404e983daa5aa74253d92c05d0" + "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/294e9da6e2e0dd404e983daa5aa74253d92c05d0", - "reference": "294e9da6e2e0dd404e983daa5aa74253d92c05d0", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", + "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", "shasum": "" }, "require": { @@ -7701,7 +8059,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.6" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.22" }, "funding": [ { @@ -7717,20 +8075,20 @@ "type": "tidelift" } ], - "time": "2022-03-02T12:42:23+00:00" + "time": "2023-03-25T09:27:28+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.4", + "version": "2.2.6", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "da444caae6aca7a19c0c140f68c6182e337d5b1c" + "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c", - "reference": "da444caae6aca7a19c0c140f68c6182e337d5b1c", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c", + "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c", "shasum": "" }, "require": { @@ -7768,22 +8126,22 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.4" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.6" }, - "time": "2021-12-08T09:12:39+00:00" + "time": "2023-01-03T09:29:04+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v5.4.1", + "version": "v5.5.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f" + "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f", - "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", + "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", "shasum": "" }, "require": { @@ -7798,15 +8156,19 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" + "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25" }, "suggest": { "ext-filter": "Required to use the boolean validator." }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.5-dev" } }, "autoload": { @@ -7838,7 +8200,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.5.0" }, "funding": [ { @@ -7850,7 +8212,7 @@ "type": "tidelift" } ], - "time": "2021-12-12T23:22:04+00:00" + "time": "2022-10-16T01:01:54+00:00" }, { "name": "voku/portable-ascii", @@ -7928,21 +8290,21 @@ }, { "name": "webmozart/assert", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "ext-ctype": "*", + "php": "^7.2 || ^8.0" }, "conflict": { "phpstan/phpstan": "<0.12.20", @@ -7980,22 +8342,22 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2022-06-03T18:03:27+00:00" }, { "name": "yajra/laravel-datatables-oracle", - "version": "v9.19.1", + "version": "v9.21.2", "source": { "type": "git", "url": "https://github.com/yajra/laravel-datatables.git", - "reference": "c4baacc0a90d5f894cdeaedf19558d8794c09b08" + "reference": "a7fd01f06282923e9c63fa27fe6b391e21dc321a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/c4baacc0a90d5f894cdeaedf19558d8794c09b08", - "reference": "c4baacc0a90d5f894cdeaedf19558d8794c09b08", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/a7fd01f06282923e9c63fa27fe6b391e21dc321a", + "reference": "a7fd01f06282923e9c63fa27fe6b391e21dc321a", "shasum": "" }, "require": { @@ -8055,7 +8417,7 @@ ], "support": { "issues": "https://github.com/yajra/laravel-datatables/issues", - "source": "https://github.com/yajra/laravel-datatables/tree/v9.19.1" + "source": "https://github.com/yajra/laravel-datatables/tree/v9.21.2" }, "funding": [ { @@ -8067,36 +8429,35 @@ "type": "patreon" } ], - "time": "2022-03-05T03:41:30+00:00" + "time": "2022-07-12T04:48:03+00:00" } ], "packages-dev": [ { "name": "barryvdh/laravel-debugbar", - "version": "v3.6.7", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298" + "reference": "3372ed65e6d2039d663ed19aa699956f9d346271" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298", - "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3372ed65e6d2039d663ed19aa699956f9d346271", + "reference": "3372ed65e6d2039d663ed19aa699956f9d346271", "shasum": "" }, "require": { - "illuminate/routing": "^6|^7|^8|^9", - "illuminate/session": "^6|^7|^8|^9", - "illuminate/support": "^6|^7|^8|^9", + "illuminate/routing": "^7|^8|^9", + "illuminate/session": "^7|^8|^9", + "illuminate/support": "^7|^8|^9", "maximebf/debugbar": "^1.17.2", - "php": ">=7.2", - "symfony/debug": "^4.3|^5|^6", - "symfony/finder": "^4.3|^5|^6" + "php": ">=7.2.5", + "symfony/finder": "^5|^6" }, "require-dev": { "mockery/mockery": "^1.3.3", - "orchestra/testbench-dusk": "^4|^5|^6|^7", + "orchestra/testbench-dusk": "^5|^6|^7", "phpunit/phpunit": "^8.5|^9.0", "squizlabs/php_codesniffer": "^3.5" }, @@ -8142,7 +8503,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7" + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.7.0" }, "funding": [ { @@ -8154,30 +8515,30 @@ "type": "github" } ], - "time": "2022-02-09T07:52:32+00:00" + "time": "2022-07-11T09:26:42+00:00" }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.12.3", + "version": "v2.13.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "3ba1e2573b38f72107b8aacc4ee177fcab30a550" + "reference": "81d5b223ff067a1f38e14c100997e153b837fe4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/3ba1e2573b38f72107b8aacc4ee177fcab30a550", - "reference": "3ba1e2573b38f72107b8aacc4ee177fcab30a550", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/81d5b223ff067a1f38e14c100997e153b837fe4a", + "reference": "81d5b223ff067a1f38e14c100997e153b837fe4a", "shasum": "" }, "require": { "barryvdh/reflection-docblock": "^2.0.6", - "composer/pcre": "^1 || ^2 || ^3", + "composer/class-map-generator": "^1.0", "doctrine/dbal": "^2.6 || ^3", "ext-json": "*", - "illuminate/console": "^8 || ^9", - "illuminate/filesystem": "^8 || ^9", - "illuminate/support": "^8 || ^9", + "illuminate/console": "^8 || ^9 || ^10", + "illuminate/filesystem": "^8 || ^9 || ^10", + "illuminate/support": "^8 || ^9 || ^10", "nikic/php-parser": "^4.7", "php": "^7.3 || ^8.0", "phpdocumentor/type-resolver": "^1.1.0" @@ -8185,16 +8546,16 @@ "require-dev": { "ext-pdo_sqlite": "*", "friendsofphp/php-cs-fixer": "^2", - "illuminate/config": "^8 || ^9", - "illuminate/view": "^8 || ^9", + "illuminate/config": "^8 || ^9 || ^10", + "illuminate/view": "^8 || ^9 || ^10", "mockery/mockery": "^1.4", - "orchestra/testbench": "^6 || ^7", + "orchestra/testbench": "^6 || ^7 || ^8", "phpunit/phpunit": "^8.5 || ^9", "spatie/phpunit-snapshot-assertions": "^3 || ^4", "vimeo/psalm": "^3.12" }, "suggest": { - "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9)." + "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10)." }, "type": "library", "extra": { @@ -8236,7 +8597,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-ide-helper/issues", - "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.12.3" + "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.13.0" }, "funding": [ { @@ -8248,27 +8609,27 @@ "type": "github" } ], - "time": "2022-03-06T14:33:42+00:00" + "time": "2023-02-04T13:56:40+00:00" }, { "name": "barryvdh/reflection-docblock", - "version": "v2.0.6", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16" + "reference": "bf44b757feb8ba1734659029357646466ded673e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16", - "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/bf44b757feb8ba1734659029357646466ded673e", + "reference": "bf44b757feb8ba1734659029357646466ded673e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.0,<4.5" + "phpunit/phpunit": "^8.5.14|^9" }, "suggest": { "dflydev/markdown": "~1.0", @@ -8298,22 +8659,95 @@ } ], "support": { - "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.0.6" + "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.0" }, - "time": "2018-12-13T10:34:14+00:00" + "time": "2022-10-31T15:35:43+00:00" }, { - "name": "composer/pcre", - "version": "2.0.0", + "name": "composer/class-map-generator", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/composer/pcre.git", - "reference": "c8e9d27cfc5ed22643c19c160455b473ffd8aabe" + "url": "https://github.com/composer/class-map-generator.git", + "reference": "1e1cb2b791facb2dfe32932a7718cf2571187513" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/c8e9d27cfc5ed22643c19c160455b473ffd8aabe", - "reference": "c8e9d27cfc5ed22643c19c160455b473ffd8aabe", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/1e1cb2b791facb2dfe32932a7718cf2571187513", + "reference": "1e1cb2b791facb2dfe32932a7718cf2571187513", + "shasum": "" + }, + "require": { + "composer/pcre": "^2 || ^3", + "php": "^7.2 || ^8.0", + "symfony/finder": "^4.4 || ^5.3 || ^6" + }, + "require-dev": { + "phpstan/phpstan": "^1.6", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/filesystem": "^5.4 || ^6", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\ClassMapGenerator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Utilities to scan PHP code and generate class maps.", + "keywords": [ + "classmap" + ], + "support": { + "issues": "https://github.com/composer/class-map-generator/issues", + "source": "https://github.com/composer/class-map-generator/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-06-19T11:31:27+00:00" + }, + { + "name": "composer/pcre", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "3fdb2807b31a78a40ad89570e30ec77466c98717" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/3fdb2807b31a78a40ad89570e30ec77466c98717", + "reference": "3fdb2807b31a78a40ad89570e30ec77466c98717", "shasum": "" }, "require": { @@ -8355,7 +8789,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/2.0.0" + "source": "https://github.com/composer/pcre/tree/2.1.0" }, "funding": [ { @@ -8371,34 +8805,34 @@ "type": "tidelift" } ], - "time": "2022-02-25T20:05:29+00:00" + "time": "2022-11-16T18:32:04+00:00" }, { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^0.16 || ^1", "phpstan/phpstan": "^1.4", "phpstan/phpstan-phpunit": "^1", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -8425,7 +8859,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -8441,20 +8875,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "facade/flare-client-php", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed" + "reference": "213fa2c69e120bca4c51ba3e82ed1834ef3f41b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/b2adf1512755637d0cef4f7d1b54301325ac78ed", - "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/213fa2c69e120bca4c51ba3e82ed1834ef3f41b8", + "reference": "213fa2c69e120bca4c51ba3e82ed1834ef3f41b8", "shasum": "" }, "require": { @@ -8467,7 +8901,7 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", - "phpunit/phpunit": "^7.5.16", + "phpunit/phpunit": "^7.5", "spatie/phpunit-snapshot-assertions": "^2.0" }, "type": "library", @@ -8498,7 +8932,7 @@ ], "support": { "issues": "https://github.com/facade/flare-client-php/issues", - "source": "https://github.com/facade/flare-client-php/tree/1.9.1" + "source": "https://github.com/facade/flare-client-php/tree/1.10.0" }, "funding": [ { @@ -8506,20 +8940,20 @@ "type": "github" } ], - "time": "2021-09-13T12:16:46+00:00" + "time": "2022-08-09T11:23:57+00:00" }, { "name": "facade/ignition", - "version": "2.17.5", + "version": "2.17.7", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "1d71996f83c9a5a7807331b8986ac890352b7a0c" + "reference": "b4f5955825bb4b74cba0f94001761c46335c33e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/1d71996f83c9a5a7807331b8986ac890352b7a0c", - "reference": "1d71996f83c9a5a7807331b8986ac890352b7a0c", + "url": "https://api.github.com/repos/facade/ignition/zipball/b4f5955825bb4b74cba0f94001761c46335c33e9", + "reference": "b4f5955825bb4b74cba0f94001761c46335c33e9", "shasum": "" }, "require": { @@ -8584,7 +9018,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2022-02-23T18:31:24+00:00" + "time": "2023-01-26T12:34:59+00:00" }, { "name": "facade/ignition-contracts", @@ -8641,16 +9075,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.19.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "d7f08a622b3346766325488aa32ddc93ccdecc75" + "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/d7f08a622b3346766325488aa32ddc93ccdecc75", - "reference": "d7f08a622b3346766325488aa32ddc93ccdecc75", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/37f751c67a5372d4e26353bd9384bc03744ec77b", + "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b", "shasum": "" }, "require": { @@ -8677,7 +9111,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "v1.19-dev" + "dev-main": "v1.20-dev" } }, "autoload": { @@ -8702,22 +9136,22 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.19.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.20.0" }, - "time": "2022-02-02T17:38:57+00:00" + "time": "2022-07-20T13:12:54+00:00" }, { "name": "filp/whoops", - "version": "2.14.5", + "version": "2.15.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc" + "reference": "e864ac957acd66e1565f25efda61e37791a5db0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", + "url": "https://api.github.com/repos/filp/whoops/zipball/e864ac957acd66e1565f25efda61e37791a5db0b", + "reference": "e864ac957acd66e1565f25efda61e37791a5db0b", "shasum": "" }, "require": { @@ -8767,7 +9201,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.5" + "source": "https://github.com/filp/whoops/tree/2.15.1" }, "funding": [ { @@ -8775,7 +9209,7 @@ "type": "github" } ], - "time": "2022-01-07T12:00:00+00:00" + "time": "2023-03-06T18:09:13+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -8830,22 +9264,22 @@ }, { "name": "laravel/sail", - "version": "v1.13.5", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "aeb6eeb55b22c328d2f301145b97288127691d48" + "reference": "4f230634a3163f3442def6a4e6ffdb02b02e14d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/aeb6eeb55b22c328d2f301145b97288127691d48", - "reference": "aeb6eeb55b22c328d2f301145b97288127691d48", + "url": "https://api.github.com/repos/laravel/sail/zipball/4f230634a3163f3442def6a4e6ffdb02b02e14d6", + "reference": "4f230634a3163f3442def6a4e6ffdb02b02e14d6", "shasum": "" }, "require": { - "illuminate/console": "^8.0|^9.0", - "illuminate/contracts": "^8.0|^9.0", - "illuminate/support": "^8.0|^9.0", + "illuminate/console": "^8.0|^9.0|^10.0", + "illuminate/contracts": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0", "php": "^7.3|^8.0" }, "bin": [ @@ -8886,29 +9320,29 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2022-02-17T19:59:03+00:00" + "time": "2023-01-31T13:37:57+00:00" }, { "name": "maximebf/debugbar", - "version": "v1.18.0", + "version": "v1.18.2", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6" + "reference": "17dcf3f6ed112bb85a37cf13538fd8de49f5c274" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", - "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/17dcf3f6ed112bb85a37cf13538fd8de49f5c274", + "reference": "17dcf3f6ed112bb85a37cf13538fd8de49f5c274", "shasum": "" }, "require": { "php": "^7.1|^8", "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^2.6|^3|^4|^5|^6" + "symfony/var-dumper": "^4|^5|^6" }, "require-dev": { - "phpunit/phpunit": "^7.5.20 || ^9.4.2", + "phpunit/phpunit": ">=7.5.20 <10.0", "twig/twig": "^1.38|^2.7|^3.0" }, "suggest": { @@ -8919,7 +9353,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" } }, "autoload": { @@ -8950,22 +9384,22 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.2" }, - "time": "2021-12-27T18:49:48+00:00" + "time": "2023-02-04T15:27:00+00:00" }, { "name": "mockery/mockery", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac" + "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac", - "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac", + "url": "https://api.github.com/repos/mockery/mockery/zipball/e92dcc83d5a51851baf5f5591d32cb2b16e3684e", + "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e", "shasum": "" }, "require": { @@ -9022,22 +9456,22 @@ ], "support": { "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.5.0" + "source": "https://github.com/mockery/mockery/tree/1.5.1" }, - "time": "2022-01-20T13:18:17+00:00" + "time": "2022-09-07T15:32:08+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -9075,7 +9509,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -9083,7 +9517,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "nunomaduro/collision", @@ -9336,75 +9770,18 @@ }, "time": "2020-06-27T09:03:43+00:00" }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { @@ -9439,96 +9816,29 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" }, - "time": "2022-01-04T19:58:01+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" - }, - "time": "2021-12-08T12:19:24+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.14", + "version": "9.2.26", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4" + "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f4d60b6afe5546421462b76cd4e633ebc364ab4", - "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.15", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -9543,8 +9853,8 @@ "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { @@ -9577,7 +9887,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.14" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" }, "funding": [ { @@ -9585,7 +9895,7 @@ "type": "github" } ], - "time": "2022-02-28T12:38:02+00:00" + "time": "2023-03-06T12:58:08+00:00" }, { "name": "phpunit/php-file-iterator", @@ -9830,20 +10140,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.17", + "version": "9.6.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "5c5abcfaa2cbd44b2203995d7a339ef910fe0c8f" + "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5c5abcfaa2cbd44b2203995d7a339ef910fe0c8f", - "reference": "5c5abcfaa2cbd44b2203995d7a339ef910fe0c8f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115", + "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -9854,7 +10164,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", @@ -9862,23 +10171,19 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^2.3.4", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, - "require-dev": { - "ext-pdo": "*", - "phpspec/prophecy-phpunit": "^2.0.1" - }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -9886,7 +10191,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { @@ -9917,7 +10222,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.17" + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6" }, "funding": [ { @@ -9927,9 +10233,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-03-05T16:54:31+00:00" + "time": "2023-03-27T11:43:46+00:00" }, { "name": "sebastian/cli-parser", @@ -10100,16 +10410,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -10162,7 +10472,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -10170,7 +10480,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -10297,16 +10607,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.3", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { @@ -10348,7 +10658,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -10356,20 +10666,20 @@ "type": "github" } ], - "time": "2020-09-28T05:52:38+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -10425,7 +10735,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -10433,7 +10743,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -10670,16 +10980,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { @@ -10718,10 +11028,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -10729,7 +11039,7 @@ "type": "github" } ], - "time": "2020-10-26T13:17:30+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", @@ -10788,28 +11098,28 @@ }, { "name": "sebastian/type", - "version": "2.3.4", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914", - "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -10832,7 +11142,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/2.3.4" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -10840,7 +11150,7 @@ "type": "github" } ], - "time": "2021-06-15T12:49:02+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", @@ -10895,74 +11205,6 @@ ], "time": "2020-09-28T06:39:44+00:00" }, - { - "name": "symfony/debug", - "version": "v4.4.37", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "5de6c6e7f52b364840e53851c126be4d71e60470" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470", - "reference": "5de6c6e7f52b364840e53851c126be4d71e60470", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "psr/log": "^1|^2|^3" - }, - "conflict": { - "symfony/http-kernel": "<3.4" - }, - "require-dev": { - "symfony/http-kernel": "^3.4|^4.0|^5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides tools to ease debugging PHP code", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.37" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:41:36+00:00" - }, { "name": "theseer/tokenizer", "version": "1.2.1", @@ -11023,5 +11265,5 @@ "php": "^7.3|^8.0" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/cron_script.sh b/cron_script.sh index 58af5582..bbd3ecdb 100644 --- a/cron_script.sh +++ b/cron_script.sh @@ -1,6 +1,6 @@ #!/bin/bash echo $(date) # Will print the output of date command -/Applications/MAMP/bin/php/php7.3.29/bin/php -v -/Applications/MAMP/bin/php/php7.3.29/bin/php ../artisan business:store 0 0 2>&1 +/Applications/MAMP/bin/php/php7.3.33/bin/php -v +/Applications/MAMP/bin/php/php7.3.33/bin/php ../artisan business:store 0 0 2>&1 # php /path/to/artisan schedule:run 1>> /dev/null 2>&1 # cd /path-to-your-project && php artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file diff --git a/database/migrations/2018_10_21_164001_create_products_table.php b/database/migrations/2018_10_21_164001_create_products_table.php index 8d7cc2cb..9ea99cdd 100644 --- a/database/migrations/2018_10_21_164001_create_products_table.php +++ b/database/migrations/2018_10_21_164001_create_products_table.php @@ -66,8 +66,12 @@ class CreateProductsTable extends Migration $table->string('show_on')->nullable(); $table->boolean('shipping_addon')->default(false); + $table->boolean('buying_restriction')->default(false); $table->unsignedTinyInteger('buying_restriction_amount')->nullable(); + + $table->boolean('sponsor_buying_points')->default(false); + $table->unsignedTinyInteger('sponsor_buying_points_amount')->nullable(); $table->string('identifier', 20)->nullable(); $table->string('action')->nullable(); diff --git a/database/migrations/2019_02_23_161530_create_shopping_users_table.php b/database/migrations/2019_02_23_161530_create_shopping_users_table.php index 56f0134a..717b10a2 100644 --- a/database/migrations/2019_02_23_161530_create_shopping_users_table.php +++ b/database/migrations/2019_02_23_161530_create_shopping_users_table.php @@ -58,6 +58,8 @@ class CreateShoppingUsersTable extends Migration $table->boolean('subscribed')->default(false); $table->text('notice')->default(false); + $table->text('remarks')->default(false); + $table->unsignedInteger('homeparty_id')->nullable(); $table->unsignedInteger('shopping_collect_order_id')->nullable(); diff --git a/database/migrations/2019_02_23_163527_create_shopping_orders_table.php b/database/migrations/2019_02_23_163527_create_shopping_orders_table.php index a2b64081..f980f400 100644 --- a/database/migrations/2019_02_23_163527_create_shopping_orders_table.php +++ b/database/migrations/2019_02_23_163527_create_shopping_orders_table.php @@ -36,6 +36,8 @@ class CreateShoppingOrdersTable extends Migration $table->decimal('subtotal_ws', 13, 2)->nullable(); $table->decimal('tax', 8, 2)->nullable(); + + $table->string('net_split', 20)->nullable(); $table->string('tax_split', 20)->nullable(); $table->decimal('total_shipping', 13, 2)->nullable(); diff --git a/database/migrations/2020_01_02_165917_create_user_levels_table.php b/database/migrations/2020_01_02_165917_create_user_levels_table.php index bf492e1f..7dccba01 100644 --- a/database/migrations/2020_01_02_165917_create_user_levels_table.php +++ b/database/migrations/2020_01_02_165917_create_user_levels_table.php @@ -22,7 +22,7 @@ class CreateUserLevelsTable extends Migration $table->unsignedTinyInteger('margin_shop')->nullable(); $table->unsignedSmallInteger('qual_kp')->nullable(); - $table->unsignedInteger('qual_tp')->nullable(); + $table->unsignedInteger('qual_pp')->nullable(); $table->unsignedTinyInteger('growth_bonus')->nullable(); $table->unsignedTinyInteger('pr_line_1')->nullable(); @@ -31,6 +31,10 @@ class CreateUserLevelsTable extends Migration $table->unsignedTinyInteger('pr_line_4')->nullable(); $table->unsignedTinyInteger('pr_line_5')->nullable(); $table->unsignedTinyInteger('pr_line_6')->nullable(); + $table->unsignedTinyInteger('pr_line_7')->nullable(); + $table->unsignedTinyInteger('pr_line_8')->nullable(); + + $table->unsignedTinyInteger('paylines')->nullable(); $table->tinyInteger('pos')->unsigned()->nullable(); $table->boolean('active')->default(false); diff --git a/database/migrations/2022_03_08_102231_create_user_sales_volumes_table.php b/database/migrations/2022_03_08_102231_create_user_sales_volumes_table.php index 44152f43..62b1cdba 100644 --- a/database/migrations/2022_03_08_102231_create_user_sales_volumes_table.php +++ b/database/migrations/2022_03_08_102231_create_user_sales_volumes_table.php @@ -26,6 +26,7 @@ class CreateUserSalesVolumesTable extends Migration $table->integer('points')->nullable(); $table->integer('month_points')->nullable(); $table->integer('month_shop_points')->nullable(); + $table->unsignedTinyInteger('status_points')->index()->default(1); $table->decimal('total_net', 13, 2)->nullable(); $table->decimal('month_total_net', 13, 2)->nullable(); diff --git a/database/migrations/2022_07_18_103813_create_shopping_collect_orders_table.php b/database/migrations/2022_07_18_103813_create_shopping_collect_orders_table.php index 28988b55..6f251b1b 100644 --- a/database/migrations/2022_07_18_103813_create_shopping_collect_orders_table.php +++ b/database/migrations/2022_07_18_103813_create_shopping_collect_orders_table.php @@ -31,6 +31,7 @@ class CreateShoppingCollectOrdersTable extends Migration $table->unsignedInteger('points')->nullable(); $table->string('tax_split')->nullable(); + $table->string('net_split')->nullable(); $table->text('orders')->nullable(); $table->text('shop_items')->nullable(); diff --git a/database/migrations/2022_07_28_140152_create_user_businesses_table.php b/database/migrations/2022_07_28_140152_create_user_businesses_table.php index 74bda06d..c3bf4ec3 100644 --- a/database/migrations/2022_07_28_140152_create_user_businesses_table.php +++ b/database/migrations/2022_07_28_140152_create_user_businesses_table.php @@ -40,7 +40,8 @@ class CreateUserBusinessesTable extends Migration $table->string('first_name')->nullable(); $table->string('last_name')->nullable(); - $table->integer('sales_volume_points')->nullable(); + $table->integer('sales_volume_KP_points')->nullable(); + $table->integer('sales_volume_TP_points')->nullable(); $table->integer('sales_volume_points_shop')->nullable(); $table->integer('sales_volume_points_sum')->nullable(); @@ -48,23 +49,30 @@ class CreateUserBusinessesTable extends Migration $table->decimal('sales_volume_total_shop', 13, 2)->nullable(); $table->decimal('sales_volume_total_sum', 13, 2)->nullable(); + $table->integer('payline_points')->nullable(); + $table->integer('payline_points_qual_kp')->nullable(); + $table->decimal('margin', 5, 2)->nullable(); $table->decimal('margin_shop', 5, 2)->nullable(); $table->unsignedSmallInteger('qual_kp')->nullable(); - $table->unsignedInteger('qual_tp')->nullable(); + $table->unsignedInteger('qual_pp')->nullable(); - $table->integer('total_tp')->nullable(); - $table->integer('total_qual_tp')->nullable(); + $table->integer('total_pp')->nullable(); + $table->integer('total_qual_pp')->nullable(); - $table->decimal('commission_lines_total', 13, 2)->nullable(); $table->decimal('commission_shop_sales', 13, 2)->nullable(); - $table->decimal('commission_team_total', 13, 2)->nullable(); - + $table->decimal('commission_pp_total', 13, 2)->nullable(); + $table->decimal('commission_growth_total', 13, 2)->nullable(); + $table->text('business_lines')->nullable(); $table->text('user_items')->nullable(); $table->text('qual_user_level')->nullable(); - + $table->text('qual_user_level_next')->nullable(); + $table->text('next_qual_user_level')->nullable(); + $table->text('next_can_user_level')->nullable(); + + $table->unsignedTinyInteger('version')->index(); $table->timestamps(); diff --git a/database/migrations/2022_07_29_135844_create_user_credits_table.php b/database/migrations/2022_07_29_135844_create_user_credits_table.php index fc9e1d0f..926307f9 100644 --- a/database/migrations/2022_07_29_135844_create_user_credits_table.php +++ b/database/migrations/2022_07_29_135844_create_user_credits_table.php @@ -29,7 +29,7 @@ class CreateUserCreditsTable extends Migration $table->decimal('tax', 8, 2)->nullable(); $table->decimal('total', 13, 2)->nullable(); - $table->boolean('taxable')->default(false); + $table->unsignedTinyInteger('taxable')->default(0); $table->string('filename', 255)->nullable(); $table->string('dir', 100)->nullable(); diff --git a/public/css/application.css b/public/css/application.css index c0cad95f..e429781c 100644 --- a/public/css/application.css +++ b/public/css/application.css @@ -92,4 +92,21 @@ a[aria-expanded='true'] > .fa-caret-expand:before { .spinner { display: none; -} \ No newline at end of file +} + +.badge-outline-warning-dark { + background-color: transparent; + -webkit-box-shadow: 0 0 0 1px #FFD950 inset; + box-shadow: 0 0 0 1px #FFD950 inset; + color: #cba20d; +} + +@media only screen and (max-width: 768px) { /* mobile fix */ + .modal-body-overflow { + overflow: auto; + } +} + +div.dataTables_wrapper div.dataTables_processing { + top: 40px; +} diff --git a/public/js/iq-shopping-cart.js b/public/js/iq-shopping-cart.js index 0be2072d..042e28a9 100755 --- a/public/js/iq-shopping-cart.js +++ b/public/js/iq-shopping-cart.js @@ -49,7 +49,7 @@ var IqShoppingCart = { var _self = this; $(_self.btn_clear).on('click', function (){ _self.performRequest({action: 'clearCart'}) - .done(_self.refreshDatabaseRefreshAndView) + .done(_self.locationReload) }); $(_self.cart_input).on('change', function(){ _self.update_input_cart($(this)); @@ -134,6 +134,10 @@ var IqShoppingCart = { input.val(data.data.qty); _self.showInit(); }, + locationReload : function(){ + //location.reload(); + location.replace(location.href); + }, refreshDatabaseRefreshAndView : function (data){ var _self = IqShoppingCart; $(_self.card_holder).html(data.html_card); diff --git a/resources/lang/de/email.php b/resources/lang/de/email.php index 83761109..8048dffd 100644 --- a/resources/lang/de/email.php +++ b/resources/lang/de/email.php @@ -48,7 +48,7 @@ 'invoice_title' => 'Rechnung zu Deiner Bestellung auf mivita.care', 'credit_title' => 'Deine Gutschrift auf mivita.care', 'invoice_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend senden wir Dir die Rechnung zu deiner Bestellung: ', - 'credit_copy1line' => 'nachfolgend senden wir Dir Deine Gutschrift zu.', + 'credit_copy1line' => "Deine Gutschrift ist da und die hast Du Dir redlich verdient!\n\nWir werden den Auszahlungsbetrag in den nächsten 5 Werktagen auf Dein Konto überweisen. Bitte prüfe, ob Deine aktuellen Bankdaten in Deinem Salescenter-Account hinterlegt sind (Mein Konto -> Meine Daten). Wir wünschen Dir weiterhin eine erfolgreiche Zeit bei MIVITA.\n\nDu möchtest noch mehr erreichen? Dann sprich Deinen Sponsor oder andere Teamleiter an. Sie erarbeiten mit Dir auf Basis unseres Marketingplans einen ganz persönlichen Weg Deines Erfolges.\n\nViele Grüße,\nDein Team von MIVITA ", 'update_level_title' => 'Deine Karriere-Level auf mivita.care', 'update_level_copy1line' => 'Herzlichen Glückwunsch, Du hast im letzten Monat Deine Qualifikation (TP :tp) erreicht und hast damit Deinen nächsten Karriere-Level erreicht.

    Ab sofort bist Du: :to', 'footer_copy1' => 'mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach | Telefon: +49 (0) 8333 946 17 67 | E-Mail: info@mivita.care', diff --git a/resources/lang/de/navigation.php b/resources/lang/de/navigation.php index 32902dbb..bb0df5c9 100755 --- a/resources/lang/de/navigation.php +++ b/resources/lang/de/navigation.php @@ -45,5 +45,6 @@ return [ 'business' => 'Business', 'structure' => 'Struktur', 'commissions' => 'Provisionen', - + 'export' => 'Export', + 'sales_volumes' => 'Absatzmengen', ]; diff --git a/resources/views/admin/business/_user_detail_in.blade.php b/resources/views/admin/business/_user_detail_in.blade.php index 0617151a..937cd572 100644 --- a/resources/views/admin/business/_user_detail_in.blade.php +++ b/resources/views/admin/business/_user_detail_in.blade.php @@ -1,29 +1,5 @@ - - - - - - - - - - - - - - - - @@ -57,18 +34,32 @@ @if($TreeCalcBot->business_user->isSave()) @else - + @endif - - + + + + + + + + + + - + + + @if($TreeCalcBot->business_user->version == 1) + + + + + @endif + + @if($TreeCalcBot->business_user->version == 2) + + + - + - + + + + + @if($TreeCalcBot->business_user->qual_user_level_next) + + + + + @endif + @endif + + @if($TreeCalcBot->business_user->version == 1) + @endif + @if($TreeCalcBot->business_user->version == 2) + + + + + + + + + @endif + @if($TreeCalcBot->business_user->version == 2) + + + + + + + + + @endif + + + +
    Account ID: - {{ $TreeCalcBot->business_user->m_account }} -
    Karriere-Level: - {{ $TreeCalcBot->business_user->user_level_name }} -
    Kundenprovision: - {{ $TreeCalcBot->business_user->margin }} % -
    Shop Provision: - {{ $TreeCalcBot->business_user->margin_shop }} % -
    Account: @@ -35,6 +11,7 @@ @if($TreeCalcBot->business_user->active_date) bis: {{ formatDate($TreeCalcBot->business_user->active_date) }} @endif + (ID: {{ $TreeCalcBot->business_user->m_account }})
    Gesamte Points: - {{ $TreeCalcBot->business_user->sales_volume_points_sum }} - (Eigene: {{ $TreeCalcBot->business_user->sales_volume_points }} | Shop: {{ $TreeCalcBot->business_user->sales_volume_points_shop }}) + Karriere-Level: + {{ $TreeCalcBot->business_user->user_level_name }}   + KP {{ $TreeCalcBot->business_user->qual_kp }} / PP {{ formatNumber($TreeCalcBot->business_user->qual_pp, 0) }} +
    Kundenprovision: + {{ $TreeCalcBot->business_user->margin }} % +
    Shop Provision: + {{ $TreeCalcBot->business_user->margin_shop }} % +
    Umsatz netto: @@ -77,37 +68,79 @@
    Persönliches Volumen:Kunden Points: - KD {{ $TreeCalcBot->business_user->qual_kp }} + {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} KP + (Eigene: {{ formatNumber($TreeCalcBot->business_user->sales_volume_KP_points, 0) }} | Shop: {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_shop, 0) }}) +   KP {{ $TreeCalcBot->business_user->qual_kp }} + +
    Qualifikation Points: + {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} TP (+ Volumen KP)  
    Qualifikation Provision: - TP {{ formatNumber($TreeCalcBot->business_user->qual_tp, 0) }} / - @if($TreeCalcBot->business_user->isQualKP()) - TP {{ formatNumber($TreeCalcBot->business_user->total_qual_tp, 0) }}   - @if($TreeCalcBot->business_user->qual_user_level) - {{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_tp'], 0) }} | {{ $TreeCalcBot->business_user->qual_user_level['name'] }} + @if($TreeCalcBot->business_user->isQualLevel()) + + KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_kp'], 0) }} | + TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_pp'], 0) }} + | {{ $TreeCalcBot->business_user->qual_user_level['name'] }} @endif - @else - - @endif + +
    Payline Points: + {{ formatNumber($TreeCalcBot->business_user->payline_points, 0) }} PP
    Qualifikation Karriere:Qualifikation Points: - @if($TreeCalcBot->business_user->next_qual_user_level) - {{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_tp'], 0) }} | {{ $TreeCalcBot->business_user->next_qual_user_level['name'] }} - @else - - @endif + {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} PP (+ Volumen KP)
    aktuelle Provisions-Stufe: + @if($TreeCalcBot->business_user->isQualLevel()) + + KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_kp'], 0) }} | + PP {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_pp'], 0) }} + | {{ $TreeCalcBot->business_user->qual_user_level['name'] }} + @endif +
    nächste Provisions-Stufe: + + KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->qual_user_level_next['qual_kp'], 0) }} | + PP {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->qual_user_level_next['qual_pp'], 0) }} + | {{ $TreeCalcBot->business_user->qual_user_level_next['name'] }} +
    Provision Shop: @@ -116,19 +149,72 @@ (Umsatz Shop netto: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total_shop) }} € / {{ $TreeCalcBot->business_user->margin_shop }} %)
    Provision Team: - {{ formatNumber($TreeCalcBot->business_user->commission_team_total) }} € + {{ formatNumber($TreeCalcBot->business_user->commission_pp_total) }} €
    Provision Payline: + {{ formatNumber($TreeCalcBot->business_user->commission_pp_total) }} € +
    Provision Wachstumsbonus: + {{ formatNumber($TreeCalcBot->business_user->commission_growth_total) }} € +
    Provision Gesamt: {{ formatNumber($TreeCalcBot->business_user->getCommissionTotal()) }} €
    Team Points: + {{ formatNumber($TreeCalcBot->business_user->total_pp, 0) }} TP +
    Qualifikation Team Points: + {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} TP (+ Volumen KP) +
    @if($TreeCalcBot->business_user->next_qual_user_level) Qualifikation
    @endif nächster Karriere-Level:
    + + @if($TreeCalcBot->business_user->next_qual_user_level) + + KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_kp'], 0) }} | + TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_pp'], 0) }} + | {{ $TreeCalcBot->business_user->next_qual_user_level['name'] }} + @elseif($TreeCalcBot->business_user->next_can_user_level) + + KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->next_can_user_level['qual_kp'], 0) }} | + TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} / + {{ formatNumber($TreeCalcBot->business_user->next_can_user_level['qual_pp'], 0) }} + | {{ $TreeCalcBot->business_user->next_can_user_level['name'] }} + @else + + @endif +

    @@ -141,34 +227,31 @@ Provision % Provision € - - @for ($line=1; $line<=6; $line++) - - -
    {{ $line }}
    - - {{ formatNumber($TreeCalcBot->getKeybyLine($line, 'points'), 0) }} - {{ formatNumber($TreeCalcBot->getKeybyLine($line, 'margin'), 1) }} % - {{ formatNumber($TreeCalcBot->getKeybyLine($line, 'commission'), 2) }} € - - @endfor - @foreach ($TreeCalcBot->getGrowthBonus() as $line => $growthBonu) - - -
    {{ $line+7 }}
    - - {{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'points'), 0) }} - {{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'margin'), 1) }} % - {{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'commission'), 2) }} € + + @foreach ($TreeCalcBot->business_user->business_lines as $line => $object) + + + + @if($line <= $TreeCalcBot->business_user->getQualLevelPaylines()) +
    {{ $line }}. PP
    + @elseif($line <= $TreeCalcBot->business_user->isQualLevelGrowth($line)) +
    {{ $line }}. WB
    + @else +
    {{ $line }}.
    + @endif + + {{ formatNumber($TreeCalcBot->getKeybyLine($line, 'points'), 0) }} + {{ formatNumber($TreeCalcBot->getKeybyLine($line, 'margin'), 1) }} % + {{ formatNumber($TreeCalcBot->getKeybyLine($line, 'commission'), 2) }} € - @endforeach + @endforeach Gesamt - {{ formatNumber($TreeCalcBot->business_user->total_tp, 0) }} + {{ formatNumber($TreeCalcBot->business_user->total_pp, 0) }} - {{ formatNumber($TreeCalcBot->business_user->commission_team_total, 2) }} € + {{ formatNumber($TreeCalcBot->business_user->commission_pp_total, 2) }} € diff --git a/resources/views/admin/business/commissions.blade.php b/resources/views/admin/business/commissions.blade.php index fda0c87d..666c9f93 100644 --- a/resources/views/admin/business/commissions.blade.php +++ b/resources/views/admin/business/commissions.blade.php @@ -86,7 +86,7 @@ "order": [[3, "desc" ]], "columns": [ { data: 'commission_total', name: 'commission_total', orderable: false, searchable: false }, - { data: 'commission_team_total', name: 'commission_team_total', orderable: true, searchable: false }, + { data: 'commission_pp_total', name: 'commission_pp_total', orderable: true, searchable: false }, { data: 'commission_shop_sales', name: 'commission_shop_sales', orderable: true, searchable: false }, { data: 'm_account', name: 'm_account', orderable: true , searchable: true }, { data: 'first_name', name: 'first_name', orderable: true , searchable: true }, diff --git a/resources/views/admin/business/modal_add_points.blade.php b/resources/views/admin/business/modal_add_points.blade.php index a7a54668..a738aeda 100644 --- a/resources/views/admin/business/modal_add_points.blade.php +++ b/resources/views/admin/business/modal_add_points.blade.php @@ -34,6 +34,14 @@ {{ Form::text('points', '', array('placeholder'=>__('Points'), 'class'=>'form-control', 'id'=>'points', 'required'=>true)) }} + +
    +
    + + {{ Form::select('status_points', \App\Models\UserSalesVolume::$statusPointsTypes , 1, array('class'=>'custom-select', 'id'=>'status_points')) }} +
    +
    +
    @@ -49,10 +57,9 @@ -
    Points werden mit für den akutellen Datum hinzugefügt, da die monatliche Auswertung für die Monate davor schon berechnet sind.
    diff --git a/resources/views/admin/business/modal_edit_points.blade.php b/resources/views/admin/business/modal_edit_points.blade.php index 76e114fa..a0472557 100644 --- a/resources/views/admin/business/modal_edit_points.blade.php +++ b/resources/views/admin/business/modal_edit_points.blade.php @@ -61,6 +61,12 @@
    +
    +
    + + {{ Form::select('status_points', \App\Models\UserSalesVolume::$statusPointsTypes , $userSalesVolume->status_points, array('class'=>'custom-select', 'id'=>'status_points')) }} +
    +
    @@ -76,7 +82,7 @@ @else Points können nicht mehr geändet werden werden. @@ -84,11 +90,7 @@
    Points können nur innerhalb des akutellen Monats geändert werden, da sonst die monatliche Auswertung schon berechnet ist. Danach können Points für den akutellen Monat manuell gutgeschrieben werden.
    - Business -> Points gutschreiben - - - - + {{-- Business -> Points gutschreiben --}}

    +
    +
    + Bemerkungen +
    +
    +
    + {!! nl2br($shopping_user->remarks) !!} +
    +
    +
    +
    @if($isAdmin) diff --git a/resources/views/admin/customer/_edit.blade.php b/resources/views/admin/customer/_edit.blade.php index 1c075f7c..3de9faf5 100644 --- a/resources/views/admin/customer/_edit.blade.php +++ b/resources/views/admin/customer/_edit.blade.php @@ -254,6 +254,14 @@
    +
    +
    + + {{ Form::textarea('remarks', $shopping_user->remarks, array('placeholder'=>'Bemerkungen', 'class'=>'form-control', 'rows'=>4, 'id'=>'remarks')) }} +
    +
    +
    + {{ Form::hidden('faker_mail', $shopping_user->faker_mail) }} @if($isView === 'customer-add') diff --git a/resources/views/admin/level/index.blade.php b/resources/views/admin/level/index.blade.php index 47908374..2d93565f 100755 --- a/resources/views/admin/level/index.blade.php +++ b/resources/views/admin/level/index.blade.php @@ -23,6 +23,9 @@ {{__('Pr. L.4') }} {{__('Pr. L.5') }} {{__('Pr. L.6') }} + {{__('Pr. L.7') }} + {{__('Pr. L.8') }} + {{__('Paylines') }} {{__('W.Bonus') }} {{__('Status')}} {{__('Standard')}} @@ -45,13 +48,17 @@ {{ $value->margin }} {{ $value->margin_shop }} {{ $value->qual_kp }} - {{ $value->qual_tp }} + {{ $value->qual_pp }} {{ $value->pr_line_1 }} {{ $value->pr_line_2 }} {{ $value->pr_line_3 }} {{ $value->pr_line_4 }} {{ $value->pr_line_5 }} {{ $value->pr_line_6 }} + {{ $value->pr_line_7 }} + {{ $value->pr_line_8 }} + {{ $value->paylines }} + {{ $value->getFormattedGrowthBonus() }} {!! get_active_badge($value->active) !!} {!! get_active_badge($value->default) !!} diff --git a/resources/views/admin/modal/business_user_detail.blade.php b/resources/views/admin/modal/business_user_detail.blade.php index 18df6995..937caa3c 100644 --- a/resources/views/admin/modal/business_user_detail.blade.php +++ b/resources/views/admin/modal/business_user_detail.blade.php @@ -8,7 +8,7 @@ - +
    + + {{ Form::text('pr_line_7', $value->pr_line_7, array('placeholder'=>__('Ebene 1'), 'class'=>'form-control', 'id'=>'pr_line_7')) }} +
    +
    + + {{ Form::text('pr_line_8', $value->pr_line_8, array('placeholder'=>__('Ebene 1'), 'class'=>'form-control', 'id'=>'pr_line_8')) }} +
    diff --git a/resources/views/admin/payment/credit.blade.php b/resources/views/admin/payment/credit.blade.php index 87b74694..a431faa1 100644 --- a/resources/views/admin/payment/credit.blade.php +++ b/resources/views/admin/payment/credit.blade.php @@ -53,7 +53,7 @@ {{ $user_credit_item['first_name'] }} {{ $user_credit_item['last_name'] }} {{ $user_credit_item['email'] }} - {!! formatNumber($user_credit_item['sum']) !!} € + {!! formatNumber($user_credit_item['sum']) !!} € @foreach ($user_credit_item['entries'] as $key => $credit)
    @@ -94,22 +94,22 @@ Gutschriften / Auszahlungen
    - {!! Form::open(['url' => route('admin_payments_invoice'), 'class' => 'form-horizontal', 'id'=>'form_filter_payment_invoices']) !!} + {!! Form::open(['url' => route('admin_payments_credit'), 'class' => 'form-horizontal', 'id'=>'form_filter_payment_credits']) !!}
    - +
    - @foreach($filter_months as $key=>$value) @endforeach
    - @foreach($filter_years as $key=>$value) @endforeach @@ -154,7 +154,6 @@