diff --git a/app/Enums/LogActions.php b/app/Enums/LogActions.php index e2ad939..3b639dd 100644 --- a/app/Enums/LogActions.php +++ b/app/Enums/LogActions.php @@ -6,7 +6,6 @@ use Kwaadpepper\Enum\BaseEnum; /** * @method static self updatebasket() - * @method static self delctrlcontact() * @method static self impression() * @method static self updatecontact() */ @@ -17,7 +16,6 @@ class LogActions extends BaseEnum { return [ 'updatebasket' => 1, - 'delctrlcontact' => 2, 'impression' => 3, 'updatecontact' => 4, ]; @@ -27,7 +25,6 @@ class LogActions extends BaseEnum { return [ 'updatebasket' => 'Mise à jour du panier', - 'delctrlcontact' => 'Réinitialisation du mur', 'impression' => 'Impression', 'updatecontact' => 'Mise à jour du contact', ]; diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index 3ccd2d4..8814d85 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -309,16 +309,7 @@ class AjaxController extends Controller die(); } - if ($request->session()->has('contact')) { - $contact = $request->session()->get('contact'); - } - - if ($campagne->camp_type->equals(CampaignTypes::mur()) || $campagne->camp_type->equals(CampaignTypes::murss())) { - if (!isset($contact)) { - die(); - } - return redirect(url('/') . '/?refsite=' . $campagne->camp_siteId . '&refcamp=' . $campagne->camp_id . '&hash=' . $contact->contact_hash); - } elseif ($campagne->camp_type->equals(CampaignTypes::panier()) || $campagne->camp_type->equals(CampaignTypes::paniers())) { + if ($campagne->camp_type->equals(CampaignTypes::panier()) || $campagne->camp_type->equals(CampaignTypes::paniers())) { if ($request->session()->has('panier')) { $panier = $request->session()->get('panier'); } else { diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 134286c..1677ff8 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -44,6 +44,6 @@ class LoginController extends Controller */ protected function authenticated() { - return redirect()->route('home'); + return redirect('/'); } } diff --git a/app/Http/Controllers/Bo/MaintenanceController.php b/app/Http/Controllers/Bo/MaintenanceController.php new file mode 100644 index 0000000..73a7752 --- /dev/null +++ b/app/Http/Controllers/Bo/MaintenanceController.php @@ -0,0 +1,29 @@ +where('log_statut', 'NOK') + ->where('created_at', '>=', Carbon::now()->subMonths(5)->startOfMonth()) + ->groupBy('month') + ->orderBy('month', 'asc') + ->get(); + + $logs = $datas->toArray(); + + return view('bo.maintenance.index', compact('logs')); + } +} diff --git a/app/Http/Controllers/Bo/UserController.php b/app/Http/Controllers/Bo/UserController.php new file mode 100644 index 0000000..4db6a77 --- /dev/null +++ b/app/Http/Controllers/Bo/UserController.php @@ -0,0 +1,76 @@ +with(['users' => $users, 'logs' => []]); + } + + public function create(Request $request) + { + $sites = Site::all(); + return view('bo.users.create', compact('sites')); + } + + public function store(StoreUserRequest $request) + { + $user = new User(); + $user->fill($request->validated()); + $user->password = Hash::make($request->password); + $user->save(); + + $sites = Site::whereIn('site_id', $request->site)->get()->pluck('id')->toArray(); + $user->sites()->sync($sites); + + return redirect()->route('bo.users.edit', $user); + } + + public function edit(User $user) + { + $sites = Site::all(); + $usersites = $user->sites()->get()->pluck('site_id')->toArray(); + + return view('bo.users.edit', compact('user', 'sites', 'usersites')); + } + + public function update(UpdateUserRequest $request, User $user) + { + $user->fill($request->validated()); + $user->save(); + + $sites = Site::whereIn('site_id', $request->site)->get()->pluck('id')->toArray(); + $user->sites()->sync($sites); + + $marques = Auth::user()->sites; + $submarques = $marques->map(function ($marque) { + return $marque->only(['id', 'site_nom', 'site_id', 'site_logo']); + }); + session()->put('marques', $submarques); + + return redirect()->route('bo.users.edit', $user); + } + + public function destroy(DestroyUserRequest $request, User $user) + { + if ($user->delete()) { + return redirect()->route('bo.users.index'); + } else { + session()->flash('delete_nok', 'Erreur lors de la suppression'); + return view('bo.user.index'); + } + } +} diff --git a/app/Http/Controllers/CampagneController.php b/app/Http/Controllers/CampagneController.php index 949d5a2..c9225a1 100644 --- a/app/Http/Controllers/CampagneController.php +++ b/app/Http/Controllers/CampagneController.php @@ -412,86 +412,4 @@ class CampagneController extends Controller 'Détails Campagne' => $data ]); } - - public function getDiffCamp(Request $request) - { - $error = false; - // ---- Contrôle des paramètres - if (isset($request->refcamp) && $request->refcamp != "") { - $refcamp = $request->refcamp; - $campagne = Campagne::where(['camp_id' => $refcamp])->first(); - if (!$campagne) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 103, - 'Message' => 'La campagne n\'existe pas' - ]); - } - } else { - $error = true; - } - if (isset($request->refsite) && $request->refsite != "") { - $refsite = $request->refsite; - $site = Site::where(['site_id' => $refsite])->first(); - if (!$site) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 102, - 'Message' => 'Le site n\'existe pas' - ]); - }; - } else { - $error = true; - } - - if (isset($request->refadherent) && $request->refadherent != "") { - $refadherent = $request->refadherent; - $contact = Contact::where(['contact_siteId' => $refsite, 'contact_ref' => $refadherent])->first(); - if (!$contact) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 104, - 'Message' => 'Le contact n\'existe pas' - ]); - } - } else { - $error = true; - } - - if ($error) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 101, - 'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents' - ]); - } - - $data = array ( - 'Statut' => 'OK', - 'Site' => $site->site_nom, - 'Ref campagne' => $campagne->camp_id, - 'Nom campagne' => $campagne->camp_name, - "Ref contact" => $refadherent, - "Email contact" => $contact->contact_email, - ); - - $coupons = $campagne->coupons()->get(); - - if ($coupons->count() > 0) { - foreach ($coupons as &$coupon) { - if ($this->isAvailable($coupon, $campagne, $contact)) { - $dispo = 1; - } else { - $dispo = 0; - } - $codeTraitement = array ( - "Code traitement" => $coupon->coupon_code, - "Nom" => $coupon->coupon_name, - "Nb disponible" => $dispo, - ); - $data['Codes traitement'][] = $codeTraitement; - } - } - return response()->json($data); - } } diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index ac15edb..db55bf0 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -4,15 +4,6 @@ namespace App\Http\Controllers; use App\Contact; use App\Site; -use App\Campagne; -use App\Enums\CampaignTypes; -use App\Http\Requests\Contact\LoadWidgetContact; -use App\Http\Requests\Contact\SearchContact; -use App\Http\Requests\Contact\StoreContact; -use App\Http\Requests\Contact\UpdateContact; -use App\Log; -use App\Panier; -use App\PanierContent; use App\Traits\CouponTrait; use Illuminate\Http\Request; @@ -20,103 +11,6 @@ class ContactController extends Controller { use CouponTrait; - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index(Request $request) - { - return view('contact.index')->with('search', false); - } - - - public function search(SearchContact $request) - { - session()->put('active_route', 'contact'); - - $contacts = Contact::where('contact_siteId', session()->get('site')->site_id) - ->searchFirstname($request->searchFirstname) - ->searchName($request->searchName) - ->searchEmail($request->searchEmail) - ->searchCp($request->searchCp) - ->searchVille($request->searchVille) - ->searchCountry($request->searchCountry) - ->orderBy('contact_createdate', 'DESC') - ->paginate(15, ['*'], 'page', $request->page); - - $searchData = array( - 'name' => $request->searchName, - 'firstname' => $request->searchFirstname, - 'email' => $request->searchEmail, - 'cp' => $request->searchCp, - 'ville' => $request->searchVille, - 'pays' => $request->searchCountry - ); - - return view('contact.index')->with('contacts', $contacts)->with('search', true)->with('searchData', $searchData); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - return view('contact.create'); - } - - /** - * Store a newly created resource in storage. - * - * @param StoreContact $request - * @return \Illuminate\Http\Response - */ - public function store(StoreContact $request) - { - // TODO : Revoir le passage du site - $site = session()->get('site'); - - $contact = new Contact(); - $contact->fill($request->validated()); - $contact->contact_siteId = $site->site_id; - $contact->save(); - - return redirect()->route('contact.edit', ['contact' => $contact]); - } - - /** - * Show the form for editing the specified resource. - * - * @param \App\Campagne $campagne - * @return \Illuminate\Http\Response - */ - public function edit(Contact $contact) - { - $campagnes = Campagne::where(['camp_siteId' => $contact->contact_siteId, 'camp_published' => 1])->get(); - - return view('contact.edit', ['contact' => $contact, 'campagnes' => $campagnes]); - } - - /** - * Update the specified resource in storage. - * - * @param UpdateContact $request - * @param \App\Contact $contact - * @return \Illuminate\Http\Response - */ - public function update(UpdateContact $request, Contact $contact) - { - $contact->fill($request->validated()); - if ($contact->save()) { - session()->flash('update_ok', __('La campagne a bien été modifiée')); - } else { - session()->flash('update_nok', "Erreur lors de l'enregistrement"); - } - return redirect()->route('contact.edit', ['contact' => $contact]); - } - public function updateContact(Request $request) { $error = false; @@ -228,102 +122,4 @@ class ContactController extends Controller ]); } } - - public function loadWidget(LoadWidgetContact $request, Contact $contact) - { - $camp_id = $request->camp_id; - $campagne = Campagne::where(['camp_id' => $camp_id])->first(); - $coupons = $campagne->coupons; - - foreach ($coupons as $key => $coupon) { - if (!$this->isAvailableToPrint($coupon, $campagne)) { - $coupons->forget($key); - } - } - - $allLogs = Log::where(['log_refsite' => $campagne->camp_siteId, 'log_contactId' => $contact->contact_id, 'log_statut' => 'OK'])->orderBy('created_at', 'DESC')->get(); - $logs = array(); - foreach ($allLogs as &$l) { - $params = json_decode($l->log_params); - if ($l->log_action == 3 || $l->log_action == 1) { - $l->log_message = json_decode($l->log_message, true); - } - if (intval($params->refcamp) == $camp_id) { - array_push($logs, $l); - } - } - - // ---- Pour les types murs - if ($campagne->camp_type->equals(CampaignTypes::mur()) || $campagne->camp_type->equals(CampaignTypes::murss())) { - foreach ($coupons as &$coupon) { - $coupon->isAvailable = $this->isAvailable($coupon, $campagne, $contact); - } - unset($coupon); - - // Montant total et Nombre réductions disponible - $montantDispo = 0; - $montantTotal = 0; - $nbCoupon = 0; - foreach ($coupons as $coupon) { - $montantTotal += $coupon->coupon_value; - if ($coupon->isAvailable == true) { - $montantDispo += $coupon->coupon_value; - $nbCoupon++; - } - } - - if (count($coupons) === $nbCoupon) { - $reset = false; - } else { - $reset = true; - } - - $campagne->url = url('/') . "/?refsite=" . $campagne->camp_siteId . "&refcamp=" . $camp_id . "&hash=" . $contact->contact_hash; - - $returnHTML = view('widgets.mur') - ->with([ - 'campagne' => $campagne, - 'reset' => $reset, - 'montantTotal' => $montantTotal, - 'montantDispo' => $montantDispo, - 'logs' => $logs, - 'contact' => $contact]) - ->renderSections()['widget']; - - return json_encode(array('success' => true, 'html' => $returnHTML)); - } else { - // ---- Pour les types paniers - $panier = Panier::where(['panier_campId' => $campagne->camp_id, 'panier_contactId' => $contact->contact_id, 'panier_pending' => 1])->first(); - if ($panier) { - $panier_ref = $panier->panier_ref; - foreach ($coupons as &$coupon) { - $paniercontent = PanierContent::where(['panier_content_couponId' => $coupon->coupon_id, 'panier_content_panierId' => $panier->panier_id])->first(); - if ($paniercontent) { - $coupon->qty = $paniercontent->panier_content_quantity; - } else { - $coupon->qty = 0; - } - } - $campagne->url = url('/') . "/?basketid=" . $panier_ref; - unset($coupon); - } else { - $panier_ref = ""; - foreach ($coupons as &$coupon) { - $coupon->qty = 0; - } - $campagne->url = "Pas d'url disponible (panier non créé)"; - } - - $returnHTML = view('widgets.panier') - ->with([ - 'campagne' => $campagne, - 'contact' => $contact, - 'panier' => $panier_ref, - 'logs' => $logs, - 'coupons' => $coupons - ]) - ->renderSections()['widget']; - return json_encode(array('success' => true, 'html' => $returnHTML)); - } - } } diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php deleted file mode 100644 index 21c1184..0000000 --- a/app/Http/Controllers/CustomersController.php +++ /dev/null @@ -1,33 +0,0 @@ -email; - - $site->load("campagnes"); - - if ($email) { - $customer = Customers::where('email', $email)->first(); - if ($customer) { - $publishedCampaign = $site->campagnes->where('camp_published', 1)->pluck('camp_id'); - - $campaigns = Campagne::where('camp_published', 1)->whereHas('printedCoupons', function ($q) use ($customer, $publishedCampaign) { - $q->where('customer_id', $customer->id)->whereIn('camp_id', $publishedCampaign); - })->get(); - } - } - - return view('customers.index', compact('site', 'customer', 'campaigns', 'email')); - } -} diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php deleted file mode 100644 index e2029da..0000000 --- a/app/Http/Controllers/ExportController.php +++ /dev/null @@ -1,86 +0,0 @@ -format('Y-m-d'); - $enddate = date('Y-m-d'); - - return view('export.index')->with(['sites' => $sites, 'startdate' => $startdate, 'enddate' => $enddate]); - } - - // ------ AJAX Export - public function exportCoupons(PDFExport $request) - { - $ids = $request->ids; - $startdate = $request->startdate; - $enddate = $request->enddate; - - $coupons = Coupon::find($ids); - - $labels = $this->getLabelsForStats($startdate, $enddate); - - $paths = array(); - - foreach ($coupons as $coupon) { - $cpName = str_replace(' ', '', $coupon->coupon_name); - $full_path = 'export/' . $cpName . '_' . date('d_m_Y') . '.pdf'; - $dataCoupon = $this->getDataForCouponAllCamp($labels, $coupon); - $coupon->couponQuantity = $this->getFullQuantity($coupon); - $coupon->couponFullPrinted = $this->getUsedQuantity($coupon); - $coupon->couponPrinted = $this->getUsedQuantityOnPeriod($coupon, $startdate, $enddate); - - $pdf = App::make('dompdf.wrapper'); - - $myData = new Data(); - - $myData->addPoints($dataCoupon, "My Serie 1"); - $myData->addPoints($labels, "My Serie 2"); - $myData->setAxisName(0, "Coupons Diffusés"); - $myData->setAbscissa("My Serie 2"); - $myData->setSerieTicks("My Serie 2", 2); - $serieSettings = array("R" => 229,"G" => 11,"B" => 11); - $myData->setPalette("My Serie 1", $serieSettings); - $myPicture = new Image(700, 230, $myData); - $myPicture->setGraphArea(60, 40, 670, 190); - $myPicture->setFontProperties(array("FontSize" => 10)); - $myPicture->drawScale(array("DrawSubTicks" => true, 'LabelSkip' => 1, 'LabelRotation' => 25, "Mode" => SCALE_MODE_START0, "CycleBackground" => true,"GridR" => 102,"GridG" => 102,"GridB" => 102)); - $myPicture->setShadow(true, array("X" => 1,"Y" => 1,"R" => 0,"G" => 0,"B" => 0,"Alpha" => 10)); - $myPicture->drawLineChart(array("DisplayColor" => DISPLAY_AUTO)); - $myPicture->Render('export/temp.png'); - - $view = view('export.template')->with(['src' => 'export/temp.png', 'coupon' => $coupon, 'startdate' => $startdate, 'enddate' => $enddate])->render(); - - $pdf->loadHTML($view); - $pdf->save($full_path); - array_push($paths, $full_path); - }//end foreach - - return json_encode($paths); - } -} diff --git a/app/Http/Controllers/MaintenanceController.php b/app/Http/Controllers/MaintenanceController.php deleted file mode 100644 index 6a76194..0000000 --- a/app/Http/Controllers/MaintenanceController.php +++ /dev/null @@ -1,88 +0,0 @@ - 'NOK'])->whereMonth('created_at', $month)->count(); - array_push($count, [$month, $logs]); - } - - return view('maintenance.index')->with(['users' => $users, 'logs' => $count]); - } - - public function usercreate(Request $request) - { - $sites = Site::all(); - return view('user.create')->with(['sites' => $sites]); - } - - public function userstore(StoreUsers $request) - { - $user = new User(); - $user->fill($request->validated()); - $user->password = Hash::make($request->password); - $user->save(); - - $sites = Site::whereIn('site_id', $request->site)->get()->pluck('id')->toArray(); - $user->sites()->sync($sites); - - return redirect()->route('maintenance.user.edit', ['user' => $user]); - } - - public function useredit(User $user) - { - $sites = Site::all(); - $usersites = $user->sites()->get()->pluck('site_id')->toArray(); - return view('user.edit')->with(['user' => $user, 'sites' => $sites, 'usersites' => $usersites]); - } - - public function userupdate(UpdateUsers $request, User $user) - { - //MAJ du User - $user->fill($request->validated()); - $user->save(); - - //MAJ des sites liés - $sites = Site::whereIn('site_id', $request->site)->get()->pluck('id')->toArray(); - $user->sites()->sync($sites); - - $marques = Auth::user()->sites; - $submarques = $marques->map(function ($marque) { - return $marque->only(['id', 'site_nom', 'site_id', 'site_logo']); - }); - - session()->put('marques', $submarques); - return redirect()->route('maintenance.show'); - } - - public function userdestroy(User $user) - { - if ($user->delete()) { - return redirect()->route('maintenance.show'); - } else { - session()->flash('delete_nok', 'Erreur lors de la suppression'); - return view('maintenance.user.edit')->with('user', $user); - } - } -} diff --git a/app/Http/Controllers/MurController.php b/app/Http/Controllers/MurController.php deleted file mode 100644 index 1c6283a..0000000 --- a/app/Http/Controllers/MurController.php +++ /dev/null @@ -1,315 +0,0 @@ -all(); - if (isset($datas['refcamp'])) { - $ref = intval($datas['refcamp']); - $campagne = Campagne::where(['camp_id' => $ref])->first(); - } else { - abort(404); - } - if (!isset($datas['refsite'])) { - abort(404); - } - if (!isset($campagne) || $campagne->camp_published == 0 || ($campagne->camp_type->value != 0 && $campagne->camp_type->value != 2)) { - abort(404); - } - - if (isset($datas['hash'])) { - $contact = Contact::where([ - 'contact_hash' => $datas['hash'], 'contact_siteId' => $campagne->camp_siteId - ])->first(); - } else { - abort(404); - } - - $coupons = $this->getCouponsPublished($campagne); - - foreach ($coupons as $coupon) { - $coupon->isAvailable = $this->isAvailable($coupon, $campagne, $contact); - $coupon->isAvailableToPrint = $this->isAvailableToPrint($coupon, $campagne); - } - unset($coupon); - - // Montant total et Nombre réductions disponible - $montantDispo = 0; - $montantTotal = 0; - $nbCoupon = 0; - $nbCouponToPrint = 0; - foreach ($coupons as $coupon) { - $montantTotal += $coupon->coupon_value; - if ($coupon->isAvailable == true) { - $montantDispo += $coupon->coupon_value; - $nbCoupon++; - } - if ($coupon->isAvailableToPrint == true) { - $nbCouponToPrint++; - } - } - - session()->put('campagne', $campagne); - session()->put('site', $campagne->site); - session()->put('contact', $contact); - - return view('landings::' . $ref . '.index') - ->with(['ref' => $ref, 'coupons' => $coupons, 'contact' => $contact, 'nb' => $nbCoupon, 'nbAvailableToPrint' => $nbCouponToPrint, 'montantDispo' => $montantDispo]); - } - - public function printMur(Request $request) - { - if (isset($request->coupons)) { - session()->put('coupons', $request->coupons); - $coupons = $request->coupons; - } - - if ($request->session()->has('campagne')) { - $campagne = $request->session()->get('campagne'); - } else { - abort(419); - } - - $ref = $campagne->camp_id; - - return view('landings::' . $ref . '.imprimer') - ->with(['ref' => $ref, 'coupons' => $coupons, 'contact' => $request->session()->get('contact')]); - } - - public function deleteControlContact(Request $request) - { - if (isset($request->admin)) { - $source = 'ADMIN'; - } else { - $source = 'API'; - } - - // ---- INIT du log - $log = new Log(); - $log->log_action = config('constants.delctrlcontact'); - $log->log_source = $source; - - $error = false; - // ---- Contrôle des paramètres - if (isset($request->refcamp) && $request->refcamp != "") { - $refcamp = $request->refcamp; - } else { - $error = true; - } - if (isset($request->refadherent) && $request->refadherent != "") { - $refadherent = $request->refadherent; - } else { - $error = true; - } - // Erreur si paramètres mal renseignés - if ($error) { - $log->log_params = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]); - $log->log_statut = 'NOK'; - $log->log_message = "Des paramètres de la requête sont mal renseignés ou non présents"; - $log->save(); - - return response()->json([ - 'Statut' => 'KO', - 'Code' => 101, - 'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents' - ]); - } - - // Check de la campagne - $campagne = Campagne::where('camp_id', $refcamp)->first(); - - if (!$campagne) { - $log->log_params = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]); - $log->log_statut = 'NOK'; - $log->log_message = "La campagne n'existe pas"; - $log->save(); - return response()->json([ - 'Statut' => 'KO', - 'Code' => 103, - 'Message' => 'La campagne n\'existe pas' - ]); - } - - - // Check du contact - $contact = Contact::where(['contact_ref' => $refadherent, 'contact_siteId' => $campagne->camp_siteId])->first(); - - if (!$contact) { - $log->log_params = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]); - $log->log_refsite = $campagne->camp_siteId; - $log->log_statut = 'NOK'; - $log->log_message = "Le contact n'existe pas"; - $log->save(); - - return response()->json([ - 'Statut' => 'KO', - 'Code' => 104, - 'Message' => 'Le contact n\'existe pas' - ]); - } - - if ($campagne) { - // Update - $mur = Mur::where(['mur_campId' => $refcamp, 'mur_contactId' => $contact->contact_id])->update(['mur_deleted' => '1']); - if ($mur != 0) { - $log->log_params = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]); - $log->log_refsite = $campagne->camp_siteId; - $log->log_contactId = $contact->contact_id; - $log->log_statut = 'OK'; - $log->log_message = $mur . " enregistrements ont été mis à jour."; - $log->save(); - return response()->json([ - 'Statut' => 'OK', - 'Message' => $mur . " enregistrements ont été mis à jour." - ]); - } else { - $log->log_params = json_encode(['refcamp' => $request->refcamp, 'refadherent' => $request->refadherent]); - $log->log_refsite = $campagne->camp_siteId; - $log->log_contactId = $contact->contact_id; - $log->log_statut = 'OK'; - $log->log_message = 'Aucun contrôle à effacer'; - $log->save(); - return response()->json([ - 'Statut' => 'KO', - 'Code' => 110, - 'Message' => 'Aucun contrôle à effacer' - ]); - }//end if - }//end if - return; - } - - public function montantDispoCampagne(Request $request) - { - - // ---- Contrôle des paramètres - if (isset($request->refcamp) && $request->refcamp != "") { - $refcamp = $request->refcamp; - } else { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 101, - 'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents' - ]); - } - - // ------ Recuperation de la campagne - $camp = Campagne::where(['camp_id' => $refcamp])->first(); - if (!$camp) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 103, - 'Message' => 'La campagne n\'existe pas' - ]); - } - - // ------ Récupération des coupons de la campagne - $coupons = $camp->coupons()->where(['coupon_published' => 1])->get(); - if (count($coupons) == 0) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 105, - 'Message' => 'La campagne est vide' - ]); - } - - // ---- Montant total et Nombre réductions disponible - $montantTotal = 0; - foreach ($coupons as $coupon) { - $montantTotal += $coupon->coupon_value; - } - - $montantTotal = number_format($montantTotal, 2, ",", " "); - $montantTotal = str_pad($montantTotal, 6, "0", STR_PAD_LEFT); - - return response()->json([ - 'Statut' => 'OK', - 'Message' => $montantTotal - ]); - } - - public function montantDispoContact(Request $request) - { - $error = false; - if (isset($request->refcamp) && $request->refcamp != "") { - $refcamp = $request->refcamp; - } else { - $error = true; - } - - if (isset($request->refsite) && $request->refsite != "") { - $refsite = $request->refsite; - } else { - $error = true; - } - - if (isset($request->refadherent) && $request->refadherent != "") { - $refadherent = $request->refadherent; - } else { - $error = true; - } - - if ($error) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 101, - 'Message' => 'Des paramètres de la requête sont mal renseignés ou non présents' - ]); - } - - $campagne = Campagne::where(['camp_id' => $refcamp])->where('camp_type', 'IN', array(0,2))->first(); - - if (!$campagne) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 103, - 'Message' => 'La campagne n\'existe pas' - ]); - } - - $contact = Contact::where(['contact_siteId' => $refsite, 'contact_ref' => $refadherent])->first(); - if (!$contact) { - return response()->json([ - 'Statut' => 'KO', - 'Code' => 104, - 'Message' => 'Le contact n\'existe pas' - ]); - } - - $coupons = $this->getCouponsPublished($campagne); - - foreach ($coupons as &$coupon) { - $coupon->isAvailable = $this->isAvailable($coupon, $campagne, $contact); - } - unset($coupon); - - $montantDispo = 0; - foreach ($coupons as $coupon) { - if ($coupon->isAvailable == true) { - $montantDispo += $coupon->coupon_value; - } - } - - $montantDispo = number_format($montantDispo, 2, ",", " "); - $montantDispo = str_pad($montantDispo, 6, "0", STR_PAD_LEFT); - - return response()->json([ - 'Statut' => 'OK', - 'Message' => $montantDispo - ]); - } -} diff --git a/app/Http/Controllers/RedirectController.php b/app/Http/Controllers/RedirectController.php index 8ec9049..289642f 100644 --- a/app/Http/Controllers/RedirectController.php +++ b/app/Http/Controllers/RedirectController.php @@ -15,16 +15,12 @@ class RedirectController extends Controller */ public function __invoke(Request $request) { - $mur = new Controllers\MurController(); $panier = new Controllers\PanierController(); if (isset($request->basketid)) { return $panier->showTemplate($request); -// $this->showTemplate($request); - } elseif (isset($request->hash)) { - return $mur->show($request); } else { - return redirect()->route('home'); + return redirect()->route('login'); } } } diff --git a/app/Http/Controllers/StatistiqueController.php b/app/Http/Controllers/StatistiqueController.php deleted file mode 100644 index 3227ff2..0000000 --- a/app/Http/Controllers/StatistiqueController.php +++ /dev/null @@ -1,93 +0,0 @@ -sites()->get(); - // foreach ($sites as $site) { - // if (isset($site->campagnes)) { - // $campagnes = $site->campagnes; - // foreach ($campagnes as $campagne) { - // $coupons = $campagne->coupons; - // foreach ($coupons as $coupon) { - // $coupon->quantity = $this->getFullQuantity($coupon); - // $coupon->remain = $this->getFullQuantity($coupon) - $this->getUsedQuantity($coupon); - // $coupon->diffused = $this->getDiffusedQuantity($coupon); - // $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne); - // $coupon->isPaused = $this->isPausedToPrint($coupon, $campagne); - // } - // }//end foreach - // }//end if - // }//end foreach - $sites = []; - return view('stats.index')->with(['sites' => $sites]); - } - - /** - * Show the stat detail of a campaign. - * - * @return \Illuminate\Http\Response - */ - public function statdetail(Campagne $campagne) - { - $count = 0; - $colors = config('constants.colors'); - - $coupons = $campagne->coupons; - foreach ($coupons as $coupon) { - $coupon->quantity = $this->getFullQuantity($coupon); - $coupon->remain = $coupon->quantity - $this->getUsedQuantity($coupon); - $coupon->diffused = $this->getDiffusedQuantity($coupon); - $coupon->isPrintable = $this->isAvailableToPrint($coupon, $campagne); - $coupon->isPaused = $this->isPausedToPrint($coupon, $campagne); - $coupon->color = $coupon->color = "#" . str_pad(dechex(mt_rand(0, 255)), 2, '0', STR_PAD_LEFT) . str_pad(dechex(mt_rand(0, 255)), 2, '0', STR_PAD_LEFT) . str_pad(dechex(mt_rand(0, 255)), 2, '0', STR_PAD_LEFT); - $count++; - } - $enddate = date('Y-m-d'); - $startdate = date('Y-m-d', strtotime("-30 days")); - return view('stats.detail')->with(['campagne' => $campagne, 'startdate' => $startdate, 'enddate' => $enddate]); - } - - public function loadStats(Request $request) - { - $campid = $request->campid; - $startdate = $request->startdate; - $enddate = $request->enddate; - - // ---- Labels pour la période - $labels = $this->getLabelsForStats($startdate, $enddate); - - // ---- Data pour le graphique global - $dataGlobal = $this->getDataForCamp($labels, $campid); - - // ---- Data pour le graphique par coupons - $campagne = Campagne::where(['camp_id' => $campid])->first(); - $coupons = $campagne->coupons; - $dataSpec = []; - foreach ($coupons as $coupon) { - $dataCoupon = $this->getDataForCoupon($labels, $campid, $coupon); - $dataSpec[$coupon->coupon_code] = $dataCoupon; - } - - $data = array('labels' => $labels, 'dataGlobal' => $dataGlobal, 'dataSpec' => $dataSpec); - - return json_encode($data); - } -} diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d4b0c2d..9742dae 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -60,11 +60,7 @@ class Kernel extends HttpKernel 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, - 'process.url' => \App\Http\Middleware\ProcessSpecificUrl::class, 'saveroute' => \App\Http\Middleware\SaveCurrentRoute::class, - 'superadmin' => \App\Http\Middleware\SuperAdmin::class, - 'admin' => \App\Http\Middleware\Admin::class, - 'marketing' => \App\Http\Middleware\Marketing::class, ]; /** diff --git a/app/Http/Middleware/Admin.php b/app/Http/Middleware/Admin.php deleted file mode 100644 index 67d123d..0000000 --- a/app/Http/Middleware/Admin.php +++ /dev/null @@ -1,27 +0,0 @@ -roles == 'admin') { - return $next($request); - } elseif (Auth::check() && Auth::user()->roles == 'superadmin') { - return $next($request); - } else { - return redirect('/bo/home'); - } - } -} diff --git a/app/Http/Middleware/Marketing.php b/app/Http/Middleware/Marketing.php deleted file mode 100644 index 90140a1..0000000 --- a/app/Http/Middleware/Marketing.php +++ /dev/null @@ -1,20 +0,0 @@ -path(); - $params = $request->all(); - $paramsCount = count($params); - $contact = new Controllers\ContactController(); - $mur = new Controllers\MurController(); - $panier = new Controllers\PanierController(); - $campagne = new Controllers\CampagneController(); - $ajax = new Controllers\AjaxController(); - switch ($path) { - case 'updatecontact': - $res = $contact->updateContact($request); - break; - case 'delctrlcontact': - $res = $mur->deleteControlContact($request); - break; - case 'mntdispocampagne': - $res = $mur->montantDispoCampagne($request); - break; - case 'mntdispocontact': - $res = $mur->montantDispoContact($request); - break; - case 'updatebasket': - $res = $panier->updateBasket($request); - break; - case 'showbasket': - $res = $panier->showBasket($request); - break; - case 'getdetailcampaign': - $res = $campagne->getDetail($request); - break; - case 'getdiffctccampaign': - $res = $campagne->getDiffCamp($request); - break; - case 'imprime': - $res = $panier->printPanierSelect($request); - return $next($request); - break; - case 'imprimer': - $res = $mur->printMur($request); - return $next($request); - break; - case 'merci': - $res = $mur->getThanks($request); - return $next($request); - break; - case 'merci-panier': - $res = $panier->getThanks($request); - return $next($request); - break; - case 'index': - $res = $ajax->backToIndex($request); - break; - default: - switch ($paramsCount) { - case 0: - return redirect('bo/home'); - break; - case 1: - $res = $panier->showTemplate($request); - return $next($request); - break; - case 3: - $res = $mur->show($request); - return $next($request); - break; - case 4: - $res = $mur->show($request); - return $next($request); - break; - default: - break; - } - break; - }//end switch - - return $res; - } -} diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 69d750d..bc9bec4 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -18,7 +18,7 @@ class RedirectIfAuthenticated public function handle($request, Closure $next, $guard = null) { if (Auth::guard($guard)->check()) { - return redirect()->route('home'); + return redirect()->route('campagne.index'); } return $next($request); diff --git a/app/Http/Middleware/SaveCurrentRoute.php b/app/Http/Middleware/SaveCurrentRoute.php index 45bdab3..f1a64f3 100644 --- a/app/Http/Middleware/SaveCurrentRoute.php +++ b/app/Http/Middleware/SaveCurrentRoute.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Auth; use Closure; +use Illuminate\Support\Facades\Auth; class SaveCurrentRoute { @@ -16,26 +16,22 @@ class SaveCurrentRoute */ public function handle($request, Closure $next) { - $routeName = explode('.', \Route::currentRouteName()); - - session()->put('active_route', $routeName[0]); - $site = session()->get('site'); - - if (!isset($site)) { - session()->put('site', Auth::user()->sites->first()); - } - - $currentLogo = session()->get('site')->only(['site_logo']); - session()->put('current_logo', $currentLogo); $siteId = session()->get('marques'); - if (!isset($siteId)) { - $marques = Auth::user()->sites; + if (!$site) { + $site = Auth::user()->sites->first(); + session()->put('site', $site); + } + + $currentLogo = $site->only(['site_logo']); + session()->put('current_logo', $currentLogo); + + if (!$siteId) { + $marques = Auth::user()->sites; $submarques = $marques->map(function ($marque) { return $marque->only(['id', 'site_nom', 'site_id', 'site_logo']); }); - session()->put('marques', $submarques); } diff --git a/app/Http/Middleware/SuperAdmin.php b/app/Http/Middleware/SuperAdmin.php deleted file mode 100644 index 2b89f20..0000000 --- a/app/Http/Middleware/SuperAdmin.php +++ /dev/null @@ -1,25 +0,0 @@ -roles == 'superadmin') { - return $next($request); - } else { - return redirect('/bo/home'); - } - } -} diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 44c4e6b..533a515 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -22,6 +22,5 @@ class VerifyCsrfToken extends Middleware 'updatecontact', 'updatebasket', 'showbasket', - 'delctrlcontact' ]; } diff --git a/app/Http/Requests/Contact/LoadWidgetContact.php b/app/Http/Requests/Bo/Users/DestroyUserRequest.php similarity index 57% rename from app/Http/Requests/Contact/LoadWidgetContact.php rename to app/Http/Requests/Bo/Users/DestroyUserRequest.php index 78dfea1..40d6597 100644 --- a/app/Http/Requests/Contact/LoadWidgetContact.php +++ b/app/Http/Requests/Bo/Users/DestroyUserRequest.php @@ -1,12 +1,11 @@ roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value); + return Auth::check(); } /** @@ -26,7 +25,7 @@ class LoadWidgetContact extends FormRequest public function rules() { return [ - 'camp_id' => 'required|exists:campagne,camp_id' + // ]; } } diff --git a/app/Http/Requests/Users/StoreUsers.php b/app/Http/Requests/Bo/Users/StoreUserRequest.php similarity index 72% rename from app/Http/Requests/Users/StoreUsers.php rename to app/Http/Requests/Bo/Users/StoreUserRequest.php index e0f7cb9..a959669 100644 --- a/app/Http/Requests/Users/StoreUsers.php +++ b/app/Http/Requests/Bo/Users/StoreUserRequest.php @@ -1,12 +1,11 @@ roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value); + return Auth::check(); } /** diff --git a/app/Http/Requests/Users/UpdateUsers.php b/app/Http/Requests/Bo/Users/UpdateUserRequest.php similarity index 73% rename from app/Http/Requests/Users/UpdateUsers.php rename to app/Http/Requests/Bo/Users/UpdateUserRequest.php index eaf7b34..6bc8570 100644 --- a/app/Http/Requests/Users/UpdateUsers.php +++ b/app/Http/Requests/Bo/Users/UpdateUserRequest.php @@ -1,13 +1,12 @@ roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value); + return Auth::check(); } /** diff --git a/app/Http/Requests/Contact/SearchContact.php b/app/Http/Requests/Contact/SearchContact.php deleted file mode 100644 index 33f0c14..0000000 --- a/app/Http/Requests/Contact/SearchContact.php +++ /dev/null @@ -1,38 +0,0 @@ -roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'page' => 'sometimes|integer|nullable', - 'searchName' => 'sometimes|alpha|max:50|nullable', - 'searchFirstname' => 'sometimes|alpha|max:50|nullable', - 'searchEmail' => 'sometimes|email|max:100|nullable', - 'searchCp' => 'sometimes|integer|max:10|nullable', - 'searchVille' => 'sometimes|alpha|max:50|nullable', - 'searchCountry' => 'sometimes|integer|nullable', - ]; - } -} diff --git a/app/Http/Requests/Contact/StoreContact.php b/app/Http/Requests/Contact/StoreContact.php deleted file mode 100644 index d13e5ff..0000000 --- a/app/Http/Requests/Contact/StoreContact.php +++ /dev/null @@ -1,38 +0,0 @@ -roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'contact_ref' => 'required|unique:contact', - 'contact_nom' => 'min:3|max:50|required', - 'contact_prenom' => 'min:3|max:50|required', - 'contact_email' => 'email|required', - 'contact_cp' => 'max:10|required', - 'contact_ville' => 'max:50|required', - 'contact_country' => 'integer|required' - ]; - } -} diff --git a/app/Http/Requests/Contact/UpdateContact.php b/app/Http/Requests/Contact/UpdateContact.php deleted file mode 100644 index 8665ed5..0000000 --- a/app/Http/Requests/Contact/UpdateContact.php +++ /dev/null @@ -1,42 +0,0 @@ -roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'contact_ref' => [ - 'required', - Rule::unique('contact')->ignore($this->contact->contact_id, 'contact_id'), - ], - 'contact_nom' => 'min:3|max:50|required', - 'contact_prenom' => 'min:3|max:50|required', - 'contact_email' => 'email|required', - 'contact_cp' => 'max:10|required', - 'contact_ville' => 'max:50|required', - 'contact_country' => 'integer|required' - ]; - } -} diff --git a/app/Traits/GraphTrait.php b/app/Traits/GraphTrait.php deleted file mode 100644 index a10dcd6..0000000 --- a/app/Traits/GraphTrait.php +++ /dev/null @@ -1,76 +0,0 @@ -diff($datetime2); - $days = $interval->format('%a'); - - // ---- Labels des graphiques - $labels = []; - for ($i = 0; $i <= $days; $i++) { - $date = date('d/m/Y', strtotime("+" . $i . " days", strtotime($startdate))); - array_push($labels, $date); - } - - return $labels; - } - - // ---- Data for global graph - public function getDataForCamp($labels, $campid) - { - $dataGlobal = []; - foreach ($labels as $label) { - $date = date('Y-m-d', strtotime(str_replace('/', '-', $label))); - $stat = Statistique::where(['stat_campId' => $campid])->whereDate('created_at', '=', $date)->sum('stat_couponPrinted'); - if (isset($stat)) { - $dataGlobal[] = $stat; - } else { - $dataGlobal[] = 0; - } - } - return $dataGlobal; - } - - // ---- Data for one coupon on one camp - public function getDataForCoupon($labels, $campid, $coupon) - { - $dataCoupon = []; - foreach ($labels as $label) { - $date = date('Y-m-d', strtotime(str_replace('/', '-', $label))); - $stat = Statistique::where(['stat_campId' => $campid, 'stat_couponId' => $coupon->coupon_id])->whereDate('created_at', '=', $date)->sum('stat_couponPrinted'); - if (isset($stat)) { - $dataCoupon[] = $stat; - } else { - $dataCoupon[] = 0; - } - } - return $dataCoupon; - } - - // ---- Data for one coupon all camp - public function getDataForCouponAllCamp($labels, $coupon) - { - $dataCoupon = []; - foreach ($labels as $label) { - $date = date('Y-m-d', strtotime(str_replace('/', '-', $label))); - $stat = Statistique::where(['stat_couponId' => $coupon->coupon_id])->whereDate('created_at', '=', $date)->sum('stat_couponPrinted'); - if (isset($stat)) { - $dataCoupon[] = $stat; - } else { - $dataCoupon[] = 0; - } - } - return $dataCoupon; - } -} diff --git a/composer.json b/composer.json index 751bea0..550f552 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,6 @@ { - "name": "laravel/laravel", - "description": "The Laravel Framework.", - "keywords": [ - "framework", - "laravel" - ], - "license": "MIT", + "name": "uwil/mesbr", + "description": "Webcoupon management system", "type": "project", "require": { "php": "^7.3", @@ -22,7 +17,6 @@ "ldc/ldccrmv2client": "^3.0.5", "picqer/php-barcode-generator": "^0.3.0", "sentry/sentry-laravel": "^4.13", - "szymach/c-pchart": "^3.0", "uxweb/sweet-alert": "^2.0", "vladimir-yuldashev/laravel-queue-rabbitmq": "^11.3" }, diff --git a/composer.lock b/composer.lock index 762b60c..c5a61e5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "30db3ec95147621d8486d7ad5796a124", + "content-hash": "1b3d7e201bf5b5d95441c22f9c4d2265", "packages": [ { "name": "barryvdh/laravel-dompdf", @@ -6572,77 +6572,6 @@ ], "time": "2024-11-08T15:21:10+00:00" }, - { - "name": "szymach/c-pchart", - "version": "v3.0.17", - "source": { - "type": "git", - "url": "https://github.com/szymach/c-pchart.git", - "reference": "c022568da78f73bb7acf7db7a974934a434d47d7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/szymach/c-pchart/zipball/c022568da78f73bb7acf7db7a974934a434d47d7", - "reference": "c022568da78f73bb7acf7db7a974934a434d47d7", - "shasum": "" - }, - "require": { - "ext-gd": "*", - "php": "^5.4|^7.0|^8.0" - }, - "require-dev": { - "codeception/codeception": "^4.1.22", - "codeception/module-asserts": "^1.3", - "codeception/module-filesystem": "^1.0", - "phpunit/phpunit": "^5.7|^9.5", - "squizlabs/php_codesniffer": "^3.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "2.0": "2.0.x-dev", - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "files": [ - "constants.php" - ], - "psr-4": { - "CpChart\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-3.0-only" - ], - "authors": [ - { - "name": "Jean-Damien Pogolotti", - "homepage": "http://www.pchart.net", - "role": "Creator of the original pChart library" - }, - { - "name": "Piotr Szymaszek", - "homepage": "https://github.com/szymach", - "role": "Developer of the CpChart wrapper package" - } - ], - "description": "Port of \"pChart\" library into PHP 5+", - "homepage": "https://github.com/szymach/c-pchart", - "keywords": [ - "CpChart", - "c-pChart", - "charts", - "pchart", - "statistics" - ], - "support": { - "issues": "https://github.com/szymach/c-pchart/issues", - "source": "https://github.com/szymach/c-pchart/tree/v3.0.17" - }, - "time": "2023-05-27T11:12:02+00:00" - }, { "name": "tijsverkoyen/css-to-inline-styles", "version": "v2.2.7", diff --git a/config/constants.php b/config/constants.php index 16a85d2..07e18c0 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,6 @@ return [ 'updatebasket' => 1, -'delctrlcontact' => 2, 'impression' => 3, 'updatecontact' => 4, 'colors' => ['#ffe258', '#8c86ff', '#86ffbc', '#ffc286', '#86caff', '#ff86e7', '#ff869d', '#b9ff86', '#e7ff86', '#b986ff', '#ffae86', '#5c60ff', '#ff5c5c', '#3ba33b', '#8c86ff', '#86ffbc', '#ffc286', '#86caff', '#ff86e7', '#ff869d', '#b9ff86', '#e7ff86', '#b986ff', '#ffae86', '#5c60ff', '#ff5c5c', '#3ba33b'] diff --git a/resources/js/app.js b/resources/js/app.js index fa3e437..1549c0b 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -306,17 +306,3 @@ $('body').on('click', '.expand', function(event){ contentDiv.slideUp(); } }) - -$('.open-all-stats').on('click', function(event){ - event.preventDefault(); - $('.couponStats .content').each(function(){ - $(this).slideDown(500); - }) -}) - -$('.close-all-stats').on('click', function(event){ - event.preventDefault(); - $('.couponStats .content').each(function(){ - $(this).slideUp(500); - }) -}) \ No newline at end of file diff --git a/resources/views/bo/maintenance/index.blade.php b/resources/views/bo/maintenance/index.blade.php new file mode 100644 index 0000000..04a859b --- /dev/null +++ b/resources/views/bo/maintenance/index.blade.php @@ -0,0 +1,54 @@ +@extends('layouts.main') + +@section('content') + +

+ + {{ __('Maintenance') }} +

+
+
{{ __("Erreur d'appels") }} :
+ +
+@endsection + +@section('scripts') + + +@endsection diff --git a/resources/views/user/create.blade.php b/resources/views/bo/users/create.blade.php similarity index 95% rename from resources/views/user/create.blade.php rename to resources/views/bo/users/create.blade.php index 5b1e8da..3e47586 100644 --- a/resources/views/user/create.blade.php +++ b/resources/views/bo/users/create.blade.php @@ -15,7 +15,7 @@ @endif
-
+ @csrf
diff --git a/resources/views/user/edit.blade.php b/resources/views/bo/users/edit.blade.php similarity index 95% rename from resources/views/user/edit.blade.php rename to resources/views/bo/users/edit.blade.php index 15824cf..2646848 100644 --- a/resources/views/user/edit.blade.php +++ b/resources/views/bo/users/edit.blade.php @@ -15,7 +15,7 @@
@endif
- + @csrf @method('PUT')
diff --git a/resources/views/bo/users/index.blade.php b/resources/views/bo/users/index.blade.php new file mode 100644 index 0000000..013fbdf --- /dev/null +++ b/resources/views/bo/users/index.blade.php @@ -0,0 +1,51 @@ +@extends('layouts.main') + +@section('content') + +

+ + {{ __('Users') }} +

+ +
+
+
{{ __('Gestion des utilisateurs') }}
+ {{ __('Ajouter') }} +
+ + @if (isset($users) && count($users) > 0) + + + + + + + + + @foreach ($users as $user) + + + + + + @if (Auth::user()->id === $user->id) + + @else + + @endif + + @endforeach +
{{ __('Nom') }}{{ __('Email') }}{{ __('Rôle') }}{{ __('Site liés') }}
{{ $user->name }}{{ $user->email }}{{ $user->roles }} + @foreach ($user->sites as $site) +

{{ $site->site_nom }}

+ @endforeach + 		+ + @csrf + @method('DELETE') + + +
+ @endif +
+@endsection \ No newline at end of file diff --git a/resources/views/contact/create.blade.php b/resources/views/contact/create.blade.php deleted file mode 100644 index ac7fbaf..0000000 --- a/resources/views/contact/create.blade.php +++ /dev/null @@ -1,66 +0,0 @@ -@extends('layouts.main') - -@section('content') -

- - {{ __('Créer un contact') }} -

-@if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-@endif -
-
- @csrf -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- - -
-
-
- {{ __('Les champs avec un * sont obligatoires') }} - -
-
-
-@endsection diff --git a/resources/views/contact/edit.blade.php b/resources/views/contact/edit.blade.php deleted file mode 100644 index fb7aea0..0000000 --- a/resources/views/contact/edit.blade.php +++ /dev/null @@ -1,281 +0,0 @@ -@extends('layouts.main') - -@section('content') -

- - {{ __('Editer le contact') }} -

-@if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-@endif -
-
- @csrf - @method('PUT') -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- - -
-
- -
- {{ __('Les champs avec un * sont obligatoires') }} - -
-
-
-

- - - - {{ __('Campagnes liées') }} -

-
- - - @foreach ($campagnes as $campagne) -
-

{{$campagne->camp_name}}

-

{{ __('Type') }} : {{ $campagne->camp_type->label }}

- -
-
-
-
-
-

{{ __('Chargement') }}...

-
- -
- @endforeach -
-@endsection -@section('scripts') - -@endsection diff --git a/resources/views/contact/index.blade.php b/resources/views/contact/index.blade.php deleted file mode 100644 index 9755fa8..0000000 --- a/resources/views/contact/index.blade.php +++ /dev/null @@ -1,111 +0,0 @@ -@extends('layouts.main') - -@section('content') - -

- - {{ __('Recherche de contacts') }} - - - {{ __('Ajouter') }} - -

-
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif -
-
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
- -
-
-
-
-@if(isset($contacts) && count($contacts)>0) -
- - - - - - - - - - @foreach ($contacts as $contact) - @php - if (!in_array($contact->contact_country, Countries::toValues())) { - $contact->contact_country = 250; - } - @endphp - - - - - - - - - @endforeach - - - - - -
{{ __('Ref') }}{{ __('Nom') }}{{ __('Email') }}{{ __('Code Postal') }}{{ __('Ville') }}{{ __('Pays') }}
{{ $contact->contact_ref }}{{ $contact->contact_prenom }} {{$contact->contact_nom}}{{ $contact->contact_email }}{{ $contact->contact_cp }}{{ $contact->contact_ville }}{{ Countries::make($contact->contact_country)->label }}
- @if($search) - {{ $contacts->appends(request()->input())->links() }} - @endif -
- -
-@endif -@endsection diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php deleted file mode 100644 index 5f17d09..0000000 --- a/resources/views/customers/index.blade.php +++ /dev/null @@ -1,80 +0,0 @@ -@extends('layouts.main') - -@section('content') - -

- - {{ __('Customers') }} {{ $site->site_nom }} -

-@if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-@endif -
-
-
- @csrf - - -
-
- @if (!is_null($email)) - - - - - - - - @if (!count($campaigns)) - - - - @else - - - - - - @endif - -
{{ __('Email') }}{{ __('Pays') }}
{{ __('Aucun résultat.') }}
{{ $customer->email }}{{ Countries::make($customer->country)->label }}Détails
- @foreach ($campaigns as $campaign) -
-

{{ $campaign->camp_name }}

-

Type : {{ $campaign->camp_type->label }}

-
-
-

Pas de contrôle à réinitialiser

-
-
-
- @endforeach - @endif - {{--
-
-

Mur BR Le Gaulois

-

Type : Mur

-
-
-

Pas de contrôle à réinitialiser

-
-
-
-
-

OP Gauloisirs

-

Type : Panier

-
-
- -
-
-
-
--}} -
-@endsection diff --git a/resources/views/export/index.blade.php b/resources/views/export/index.blade.php deleted file mode 100644 index 2d487c3..0000000 --- a/resources/views/export/index.blade.php +++ /dev/null @@ -1,73 +0,0 @@ -@extends('layouts.main') - -@section('content') -

- - {{ __('Export des données coupons') }} -

-
-

{{ __('Période') }} :

- - - - {{ __('Exporter les données') }} -
-@foreach ($sites as $site) -

{{ $site->site_nom }} ({{ $site->site_id }})

- @foreach ($site->coupons as $coupon) -
- - -
- @endforeach -@endforeach -
- {{ __('Exporter les données') }} - -
- -@endsection - -@section('scripts') - -@endsection diff --git a/resources/views/export/template.blade.php b/resources/views/export/template.blade.php deleted file mode 100644 index f9ee366..0000000 --- a/resources/views/export/template.blade.php +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - -
-

MesBR.eu

-

{{ $coupon->coupon_name }}

-

{{ __('Diffusions du') }} {{ date('d/m/Y', strtotime($startdate)) }} {{ __('au') }} {{ date('d/m/Y', strtotime($enddate)) }}

- -

{{ __('Détail du coupon') }}

- - - - - - - - - - - - - - - @if($coupon->coupon_mindatediffusion != null) - - @else - - @endif - @if($coupon->coupon_maxdatediffusion != null) - - @else - - @endif - -
{{ __('Nom') }}{{ __('Code') }}{{ __('Quantité totale') }}{{ __('Qté totale diffusée') }}{{ __('Date de début de diffusion') }}{{ __('Date de fin de diffusion') }}
{{ $coupon->coupon_name }}{{ $coupon->coupon_code }}{{ $coupon->couponQuantity }}{{ $coupon->couponFullPrinted }}{{ date('d/m/Y', strtotime($coupon->coupon_mindatediffusion)) }}{{ __('n/c') }}{{ date('d/m/Y', strtotime($coupon->coupon_maxdatediffusion)) }}{{ __('n/c') }}
-

{{ __('Graphique de diffusion sur la période du') }} {{ date('d/m/Y', strtotime($startdate)) }} {{ __('au') }} {{ date('d/m/Y', strtotime($enddate)) }}

-

{{ __('Nombre de coupons diffusés') }} : {{ $coupon->couponPrinted }}

- -
- - diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php index d146f40..3aa8336 100644 --- a/resources/views/layouts/header.blade.php +++ b/resources/views/layouts/header.blade.php @@ -1,7 +1,7 @@
- diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php index 7b45de5..5568075 100644 --- a/resources/views/layouts/menu.blade.php +++ b/resources/views/layouts/menu.blade.php @@ -1,17 +1,17 @@ +@php +$authUserRole = Auth::user()->roles; +@endphp