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

user shops + shipping

Browse source
This commit is contained in:
Kevin Adametz 2019-01-06 01:40:44 +01:00
parent ccc2af4bf7
commit d4f6a774d0
53 changed files with 2326 additions and 814 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/Http/Controllers/Api/KasController.php
View file

@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller;
use Input;
use Session;
use \SoapClient;
class KasController extends Controller
@ -17,6 +18,7 @@ class KasController extends Controller
private $session_lifetime = 600; // Gültigkeit des Tokens in Sek. bis zur neuen Authentifizierung
private $session_update_lifetime = 'Y'; // bei N läuft die Session nach <$session_lifetime> Sekunden ab, bei Y verlängert sich die Session mit jeder Benutzung
private $CredentialToken = false;
private $kas_flood_delay = 2;
/**
* Create a new controller instance.
@ -31,6 +33,7 @@ class KasController extends Controller
public function action($func, $para = array()){
$this->checkSession($func);
try
{
$Params = array(); // Parameter für die API-Funktion
@ -42,6 +45,8 @@ class KasController extends Controller
'KasRequestType' => $func, // API-Funktion
'KasRequestParams' => $para // Parameter an die API-Funktion
)));
Session::put('flood_protection.'.$func, time() + $this->kas_flood_delay + 0.2);
if(isset($req['Response']['ReturnString']) && $req['Response']['ReturnString'] == "TRUE"){
return $req['Response']['ReturnInfo'];
}
@ -60,8 +65,11 @@ class KasController extends Controller
private function login(){
$this->checkSession('auth');
try
{
$SoapLogon = new SoapClient('https://kasapi.kasserver.com/soap/wsdl/KasAuth.wsdl');
$this->CredentialToken = $SoapLogon->KasAuth(json_encode(array(
'KasUser' => $this->kas_user,
@ -70,6 +78,8 @@ class KasController extends Controller
'SessionLifeTime' => $this->session_lifetime,
'SessionUpdateLifeTime' => $this->session_update_lifetime
)));
Session::put('flood_protection.auth', time() + $this->kas_flood_delay + 0.2);
}
// Fehler abfangen und ausgeben
@ -83,7 +93,19 @@ class KasController extends Controller
}
private function checkSession($func)
{
$name = 'flood_protection.'.$func;
if(Session::exists($name)){
$time_to_wait = (float)Session::get($name) - time();
Session::forget($name);
}else {
$time_to_wait = 0;
}
if ( $time_to_wait >= 0 ) {
usleep( intval( $time_to_wait*1000000 ) );
}
}
}

104
app/Http/Controllers/ShippingController.php Executable file
View file

@ -0,0 +1,104 @@
<?php
namespace App\Http\Controllers;
use App\Models\Shipping;
use Input;
use Illuminate\Http\Request;
use Validator;
class ShippingController extends Controller
{
public function __construct()
{
$this->middleware('superadmin');
}
/**
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index()
{
$data = [
'values' => Shipping::all(),
];
return view('admin.shipping.index', $data);
}
public function edit($shipping_id)
{
if($shipping_id == "new"){
$shipping = new Shipping();
$shipping->active = 1;
}else{
$shipping = Shipping::findOrFail($shipping_id);
}
$data = [
'value' => $shipping,
];
return view('admin.shipping.edit', $data);
}
/**
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
*/
public function store(Request $request)
{
$data = Input::all();
if ($data['id'] == "new") {
$shipping = new Shipping();
$rules = array(
'name' => 'required',
);
} else {
$shipping = Shipping::findOrFail($data['id']);
$rules = array(
'name' => 'required',
);
}
$data = [
'value' => $shipping,
];
$validator = Validator::make(Input::all(), $rules);
if ($validator->fails()) {
return view('admin.shipping.edit', $data)->withErrors($validator);
}
$data = Input::all();
$shipping->name = $data['name'];
$shipping->free = $data['free'];
$shipping->active = isset($data['active']) ? true : false;
$shipping->save();
\Session()->flash('alert-save', true);
return redirect(route('admin_shipping_edit', [$shipping->id]));
}
public function deleteShipping($shipping_id)
{
$shipping = Shipping::findOrFail($shipping_id);
$shipping->delete();
\Session()->flash('alert-success', "Versandkosten gelöscht");
return redirect('/admin/shippings');
}
}

16
app/Http/Controllers/Web/CardController.php
View file

@ -5,6 +5,7 @@ namespace App\Http\Controllers\Web;
use App\Http\Controllers\Controller;
use App\Models\Product;
use Util;
use Yard;
use Input;
@ -56,7 +57,10 @@ class CardController extends Controller
}
public function showCard(){
return view('web.templates.card');
$data = [
'user_shop' => Util::getUserShop(),
];
return view('web.templates.card', $data);
}
public function updateCard(){
@ -73,11 +77,17 @@ class CardController extends Controller
}
public function checkoutCard(){
return view('web.templates.checkout');
$data = [
'user_shop' => Util::getUserShop(),
];
return view('web.templates.checkout', $data);
}
public function checkoutFinalCard(){
return view('web.templates.checkout-final');
$data = [
'user_shop' => Util::getUserShop(),
];
return view('web.templates.checkout-final', $data);
}

17
app/Http/Controllers/Web/SiteController.php
View file

@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
use App\Models\Category;
use App\Models\Product;
use Input;
use Util;
class SiteController extends Controller
{
@ -22,7 +23,10 @@ class SiteController extends Controller
public function index()
{
return view('web.index');
$data = [
'user_shop' => Util::getUserShop()
];
return view('web.index', $data);
}
public function site($site, $subsite = false, $product_slug = false)
@ -35,6 +39,7 @@ class SiteController extends Controller
if ($category && $product) {
$data = [
'user_shop' => Util::getUserShop(),
'subsite' => $subsite,
'categories' => Category::where('active', true)->orderBy('pos', 'ASC')->get(),
'product' => $product,
@ -51,6 +56,7 @@ class SiteController extends Controller
$category = Category::where('slug', $subsite)->where('active', true)->first();
if ($category) {
$data = [
'user_shop' => Util::getUserShop(),
'subsite' => $subsite,
'categories' => Category::where('active', true)->orderBy('pos', 'ASC')->get(),
'products' => Product::whereHas('categories', function ($query) use ($category) {
@ -65,6 +71,7 @@ class SiteController extends Controller
}
}
$data = [
'user_shop' => Util::getUserShop(),
'subsite' => 'alle-produkte',
'categories' => Category::where('active', true)->orderBy('pos', 'ASC')->get(),
'products' => Product::where('active', true)->orderBy('pos', 'ASC')->get(),
@ -72,17 +79,19 @@ class SiteController extends Controller
];
return view('web.templates.'.$site, $data);
}
$data = [
'user_shop' => Util::getUserShop()
];
if($subsite){
if(!view()->exists('web.templates.'.$subsite)){
abort(404);
}
return view('web.templates.'.$subsite);
return view('web.templates.'.$subsite, $data);
}
if(!view()->exists('web.templates.'.$site)){
abort(404);
}
return view('web.templates.'.$site);
return view('web.templates.'.$site, $data);
}