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

checkout, register, payment,

Browse source 
checkout correction,
register wizard,
payment packege,
This commit is contained in:
Kevin Adametz 2019-03-02 00:08:11 +01:00
parent 6e3adac4d7
commit 446bc4561b
48 changed files with 2580 additions and 1493 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/Services/Util.php
View file

@ -52,6 +52,15 @@ class Util
return false;
}
public static function getAuthUser(){
if(\Session::has('auth_user')){
if($auth_user = \Session::get('auth_user')){
return $auth_user;
}
}
return false;
}
public static function addRoute($p = []){
$b = [];
@ -73,11 +82,11 @@ class Util
return false;
}
public static function getUserShopBackUrl(){
public static function getUserShopBackUrl($reference = ""){
if(\Session::has('user_shop')){
if($user_shop = \Session::get('user_shop')){
return 'http://'.$user_shop->slug.".".Config('app.domain')."/back/to/shop";
return 'http://'.$user_shop->slug.".".Config('app.domain')."/back/to/shop/".$reference;
}
}
return url("/");

16
app/Services/Yard.php
View file

@ -12,7 +12,7 @@ use Illuminate\Support\Collection;
class Yard extends Cart
{
private $shipping = 0;
private $shipping_country_id = 7; //default de
private $shipping_country_id = 0; //default de
private $ysession;
private $yinstance;
@ -30,9 +30,13 @@ class Yard extends Cart
parent::__construct($session, $events);
if($this->shipping_country_id == 0){
$shippingCountry = ShippingCountry::first();
$this->shipping_country_id = $shippingCountry->id;
}
if($this->shipping == 0){
self::instance('shopping')->setShippingCountryWithPrice($this->shipping_country_id);
}
}
@ -90,10 +94,12 @@ class Yard extends Cart
if($shipping_country_id > 0){
$shippingCountry = ShippingCountry::find($shipping_country_id);
$shipping = $shippingCountry->shipping;
if($this->weight()){
//blance by weigt
if($this->weight() == 0){
$price = $shipping->prices->first();
$price->price = 0;
}else{
$price = $shipping->prices->first();
}
$price = $shipping->prices->first();
if($price){
$this->shipping = floatval($price->price);
$this->putShippingExtra('shipping_price', $this->shipping);