diff --git a/_ide_helper.php b/_ide_helper.php
index deef827..e54cb27 100644
--- a/_ide_helper.php
+++ b/_ide_helper.php
@@ -16963,10 +16963,40 @@
*
* @static
*/
- public static function reCalculateShippingPrice()
+ public static function reCalculate()
{
/** @var \App\Services\Yard $instance */
- return $instance->reCalculateShippingPrice();
+ return $instance->reCalculate();
+ }
+ /**
+ *
+ *
+ * @static
+ */
+ public static function calculateMargins()
+ {
+ /** @var \App\Services\Yard $instance */
+ return $instance->calculateMargins();
+ }
+ /**
+ *
+ *
+ * @static
+ */
+ public static function getYardMargin()
+ {
+ /** @var \App\Services\Yard $instance */
+ return $instance->getYardMargin();
+ }
+ /**
+ *
+ *
+ * @static
+ */
+ public static function getYardCommission()
+ {
+ /** @var \App\Services\Yard $instance */
+ return $instance->getYardCommission();
}
/**
*
@@ -16977,6 +17007,26 @@
{
/** @var \App\Services\Yard $instance */
return $instance->setShippingCountryWithPrice($shipping_country_id, $shipping_is_for);
+ }
+ /**
+ *
+ *
+ * @static
+ */
+ public static function setShoppingUser($user, $payment_credit = false)
+ {
+ /** @var \App\Services\Yard $instance */
+ return $instance->setShoppingUser($user, $payment_credit);
+ }
+ /**
+ *
+ *
+ * @static
+ */
+ public static function getPaymentCredit()
+ {
+ /** @var \App\Services\Yard $instance */
+ return $instance->getPaymentCredit();
}
/**
*
@@ -17031,6 +17081,26 @@
{
/** @var \App\Services\Yard $instance */
return $instance->totalWithShipping($decimals, $decimalPoint, $thousandSeperator);
+ }
+ /**
+ *
+ *
+ * @static
+ */
+ public static function totalWithShippingWithoutCredit($decimals = null, $decimalPoint = null, $thousandSeperator = null)
+ {
+ /** @var \App\Services\Yard $instance */
+ return $instance->totalWithShippingWithoutCredit($decimals, $decimalPoint, $thousandSeperator);
+ }
+ /**
+ *
+ *
+ * @static
+ */
+ public static function totalfromCredit($decimals = null, $decimalPoint = null, $thousandSeperator = null)
+ {
+ /** @var \App\Services\Yard $instance */
+ return $instance->totalfromCredit($decimals, $decimalPoint, $thousandSeperator);
}
/**
* Get the total price of the items in the cart.
@@ -17103,10 +17173,10 @@
* @return float
* @static
*/
- public static function subtotal($decimals = null, $decimalPoint = null, $thousandSeperator = null)
+ public static function subtotal($decimals = null, $decimalPoint = null, $thousandSeperator = null, $discount = true)
{
/** @var \App\Services\Yard $instance */
- return $instance->subtotal($decimals, $decimalPoint, $thousandSeperator);
+ return $instance->subtotal($decimals, $decimalPoint, $thousandSeperator, $discount);
}
/**
*
diff --git a/app/Http/Controllers/Api/ShoppingUserController.php b/app/Http/Controllers/Api/ShoppingUserController.php
index 709471f..69518c9 100755
--- a/app/Http/Controllers/Api/ShoppingUserController.php
+++ b/app/Http/Controllers/Api/ShoppingUserController.php
@@ -626,7 +626,7 @@ class ShoppingUserController extends Controller
'subtotal' => Yard::instance('shopping')->subtotal(2, '.', ''),
'shipping' => Yard::instance('shopping')->shipping(2, '.', ','),
'shipping_net' => Yard::instance('shopping')->shippingNet(2, '.', ''),
- 'subtotal_ws' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''),
+ 'subtotal_shipping' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''),
'tax' => Yard::instance('shopping')->taxWithShipping(2, '.', ''),
'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ''),
'points' => Yard::instance('shopping')->points(),
diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index e453c1a..63c161c 100755
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -172,7 +172,7 @@ class CustomerController extends Controller
data-action="shopping-user-is-like-member"
data-back="'.route('admin_customers').'"
data-modal="modal-xl"
- data-route="'.route('modal_load').'">'.$ShoppingUser->member->getFullName().' ';
diff --git a/app/Http/Controllers/LeadController.php b/app/Http/Controllers/LeadController.php
index 1e4d852..2a18979 100755
--- a/app/Http/Controllers/LeadController.php
+++ b/app/Http/Controllers/LeadController.php
@@ -222,25 +222,27 @@ class LeadController extends Controller
public function released($action, $id){
$user = User::findOrFail($id);
-
if($action === 'completed'){
$validator = Validator::make(Request::all(), []);
- if(!$user->m_sponsor){
- $validator->errors()->add('m_sponsor', __('Berater hat keinen Sponsor.'));
- }
+ /*if(!$user->m_sponsor){
+ $validator->errors()->add('m_sponsor', __('Vertriebspartner hat keinen Sponsor.'));
+ }*/
if(!$user->account->m_first_name){
- $validator->errors()->add('m_first_name', __('Berater hat keinen Vornamen.'));
+ $validator->errors()->add('m_first_name', __('Vertriebspartner hat keinen Vornamen.'));
}
- if(!$user->account->m_first_name){
- $validator->errors()->add('m_last_name', __('Berater hat keinen Nachnamen.'));
- }
- if(!$user->account->m_account){
- $validator->errors()->add('m_account', __('Berater hat keine Account ID'));
+ if(!$user->account->m_last_name){
+ $validator->errors()->add('m_last_name', __('Vertriebspartner hat keinen Nachnamen.'));
}
+
if ($validator->errors()->count()) {
return back()->withErrors($validator)->withRequest(Request::all());
}
+ if(!$user->account->m_account){
+ $user->account->m_account = UserAccount::max('m_account') +1;
+ $user->account->save();
+ }
+
//create PDF
$pdf = new ContractPDFRepository($user);
$pdf->_set('disk', 'user');
@@ -271,7 +273,7 @@ class LeadController extends Controller
}
UserHistory::create(['user_id' => $user->id, 'action'=>'released_completed', 'status'=>0]);
- \Session()->flash('alert-success', "Berater freigeschaltet!");
+ \Session()->flash('alert-success', "Vertriebspartner freigeschaltet!");
}
if($action === 'incomplete'){
@@ -303,7 +305,7 @@ class LeadController extends Controller
->save();
}
UserHistory::create(['user_id' => $user->id, 'action'=>'released_incomplete', 'status'=>0]);
- \Session()->flash('alert-success', "E-Mail an Berater gesendet.");
+ \Session()->flash('alert-success', "E-Mail an Vertriebspartner gesendet.");
}
return redirect(route('admin_lead_edit', [$user->id]));
diff --git a/app/Http/Controllers/MembershipController.php b/app/Http/Controllers/MembershipController.php
index 7e627c6..d2d53ea 100755
--- a/app/Http/Controllers/MembershipController.php
+++ b/app/Http/Controllers/MembershipController.php
@@ -114,7 +114,7 @@ class MembershipController extends Controller
'identifier' => $identifier,
'user_shop_id' => 1, //is first faker shop for nuy intern
'auth_user_id' => Auth::user()->id,
- 'payment' => 3, //Berater Membership
+ 'payment' => 3, //Vertriebspartner Membership
'subdomain' => url('/'),
'country_id' => Yard::instance('shopping')->getShippingCountryId(),
'shopping_data' => $data,
diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php
index db94f38..2c55d84 100644
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@@ -63,6 +63,12 @@ class ModalController extends Controller
}
+ if($data['action'] === 'user-order-show-user-level-margin'){
+ $user = User::find($data['id']);
+ $ret = view("admin.modal.user_level_margin", compact('user', 'data'))->render();
+ }
+
+
if($data['action'] === 'homeparty-add-product') {
$homeparty = Homeparty::find($data['id']);
$homeparty_user = HomepartyUser::find($data['user_id']);
diff --git a/app/Http/Controllers/PaymentMethodController.php b/app/Http/Controllers/PaymentMethodController.php
index c85c494..afe71fd 100755
--- a/app/Http/Controllers/PaymentMethodController.php
+++ b/app/Http/Controllers/PaymentMethodController.php
@@ -36,6 +36,7 @@ class PaymentMethodController extends Controller
'short' => $data['short'],
'pos' => $data['pos'],
'show_at' => $data['show_at'],
+ 'max_price' => $data['max_price'],
'default' => isset($data['default']) ? true : false,
'active' => isset($data['active']) ? true : false,
]);
@@ -44,6 +45,7 @@ class PaymentMethodController extends Controller
$model->name = $data['name'];
$model->short = $data['short'];
$model->pos = $data['pos'];
+ $model->max_price = $data['max_price'];
$model->show_at = $data['show_at'];
$model->default = isset($data['default']) ? true : false;
$model->active = isset($data['active']) ? true : false;
diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index 143d7ec..6979237 100755
--- a/app/Http/Controllers/ProductController.php
+++ b/app/Http/Controllers/ProductController.php
@@ -65,7 +65,10 @@ class ProductController extends Controller
$rules = array(
'name' => 'required',
);
- if($data['wp_number']){
+ /*if(isset($data['number']) && $data['number'] != ""){
+ $rules['number'] = 'int';
+ }*/
+ if(isset($data['wp_number'])){
if($data['id'] !== "new"){
$model = Product::findOrFail($data['id']);
$rules['wp_number'] = 'unique:products,wp_number,'.$model->id;
diff --git a/app/Http/Controllers/SalesController.php b/app/Http/Controllers/SalesController.php
index c39fed1..942aa35 100755
--- a/app/Http/Controllers/SalesController.php
+++ b/app/Http/Controllers/SalesController.php
@@ -80,7 +80,7 @@ class SalesController extends Controller
})
->addColumn('is_for', function (ShoppingOrder $ShoppingOrder) {
if($ShoppingOrder->shopping_user->is_for === 'me'){
- return 'Beraterbestellung ';
+ return 'Vertriebspartnerbestellung ';
}
if($ShoppingOrder->shopping_user->is_for === 'ot'){
return 'Kundenbestellung ';
@@ -216,7 +216,7 @@ class SalesController extends Controller
})
->addColumn('is_for', function (ShoppingOrder $ShoppingOrder) {
if($ShoppingOrder->shopping_user->is_for === 'me'){
- return 'Beraterbestellung ';
+ return 'Vertriebspartnerbestellung ';
}
if($ShoppingOrder->shopping_user->is_for === 'ot'){
return 'Kundenbestellung ';
@@ -239,7 +239,7 @@ class SalesController extends Controller
data-action="shopping-user-is-like-member"
data-back="'.route('admin_sales_customers').'"
data-modal="modal-xl"
- data-route="'.route('modal_load').'">Beraterbestellung ';
+ return 'Vertriebspartnerbestellung ';
}
if($ShoppingOrder->shopping_user->is_for === 'ot'){
return 'Kundenbestellung ';
@@ -149,6 +149,8 @@ class OrderController extends Controller
}
Yard::instance('shopping')->setShippingCountryWithPrice($shipping_country_id, $for);
+ Yard::instance('shopping')->setShoppingUser($user, true);
+
$data = [
'shopping_user' => $shopping_user,
@@ -177,7 +179,6 @@ class OrderController extends Controller
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
- dd($validator);
return back()->withErrors($validator)->withInput(Request::all());
}
@@ -214,7 +215,7 @@ class OrderController extends Controller
'identifier' => $identifier,
'user_shop_id' => 1, //is first faker shop for buy intern
'auth_user_id' => Auth::user()->id,
- 'payment' => 2, //Berater Shop
+ 'payment' => 2, //Vertriebspartner Shop
'subdomain' => url('/'),
'country_id' => Yard::instance('shopping')->getShippingCountryId(),
'shopping_data' => $data,
@@ -294,12 +295,12 @@ class OrderController extends Controller
$q->where('show_at', '=', 0)
->orWhere('show_at', '=', 1);
});
-
}
- //Kunden und Berater
- //->orWhere('show_at', '=', 2); // Nur Berater
+
+ //Kunden und Vertriebspartner
+ //->orWhere('show_at', '=', 2); // Nur Vertriebspartner
//->orderBy('pos', 'DESC')
//->orderBy('id', 'DESC');
@@ -346,6 +347,7 @@ class OrderController extends Controller
';
})*/
+
->addColumn('picture', function (Product $product) {
if(count($product->images)){
return '';
@@ -361,8 +363,15 @@ class OrderController extends Controller
->addColumn('price_vk_gross', function (Product $product) {
return $product->getFormattedPriceWith(false, false). " €";
})
+ ->addColumn('single_commission', function (Product $product) {
+ return $product->single_commission ? 'Handelspanne: '.$product->getFormattedValueCommission().' % ' : 'Staffelprovision
+ '.__('mehr lesen').'
+ '.__('weniger lesen').'
+ ';
+ $content .= '';
+ }
+ return $content;
+ }
+
public static function getRolesOptions(){
$ret = "";
foreach (self::$roles as $role_id => $value){
diff --git a/app/Services/Payment.php b/app/Services/Payment.php
index d8bfcdb..b81e863 100644
--- a/app/Services/Payment.php
+++ b/app/Services/Payment.php
@@ -141,6 +141,21 @@ class Payment
}
}
+ //if the order has action
+ if($shopping_order->shopping_user->is_from === 'user_order'){
+ //is margin -> set paid
+ $shopping_order->shopping_order_margin->paid = true;
+ $shopping_order->shopping_order_margin->save();
+ //is payment credit, reduce
+ if($shopping_order->shopping_order_margin->from_payment_credit > 0){
+ $new_credit = $shopping_order->auth_user->payment_credit - $shopping_order->shopping_order_margin->from_payment_credit;
+ $new_credit = $new_credit < 0 ? 0 : $new_credit;
+ $shopping_order->auth_user->payment_credit = $new_credit;
+ $shopping_order->auth_user->save();
+ }
+
+ }
+
return $send_link;
}
diff --git a/app/Services/Slim.php b/app/Services/Slim.php
index 79b0faf..f282d5b 100644
--- a/app/Services/Slim.php
+++ b/app/Services/Slim.php
@@ -43,10 +43,10 @@ class Slim {
if (empty($value)) {return null;}
// If magic quotes enabled
- if (get_magic_quotes_gpc()) {
+ /* if (get_magic_quotes_gpc()) {
$value = stripslashes($value);
}
-
+*/
// The data is posted as a JSON String so to be used it needs to be deserialized first
$data = json_decode($value);
diff --git a/app/Services/UserMarign.php b/app/Services/UserMarign.php
new file mode 100644
index 0000000..fa98dff
--- /dev/null
+++ b/app/Services/UserMarign.php
@@ -0,0 +1,87 @@
+startOfMonth()->toDateString();
+ $endDay = $now->endOfMonth()->toDateString();
+
+ $sum_net_amount = ShoppingOrderMargin::whereUserId($user->id)
+ ->whereBetween('from', [$startDay, $endDay])
+ ->wherePaid(true)
+ ->whereCancellation(false)
+ ->sum('net_price');
+ if($format){
+ $sum_net_amount = Util::formatNumber($sum_net_amount);
+ }
+ return $sum_net_amount;
+ }
+
+ public static function getMontlyPriceOpen(User $user, $date = null, $format = false){
+
+ $now = $date ? Carbon::parse($date) : Carbon::now();
+ $startDay = $now->startOfMonth()->toDateString();
+ $endDay = $now->endOfMonth()->toDateString();
+
+ $sum_net_amount = ShoppingOrderMargin::whereUserId($user->id)
+ ->whereBetween('from', [$startDay, $endDay])
+ ->wherePaid(false)
+ ->whereCancellation(false)
+ ->sum('net_price');
+ if($format){
+ $sum_net_amount = Util::formatNumber($sum_net_amount);
+ }
+ return $sum_net_amount;
+ }
+
+ public static function getMontlyAmount(User $user, $date = null, $format = false){
+
+ $now = $date ? Carbon::parse($date) : Carbon::now();
+ $startDay = $now->startOfMonth()->toDateString();
+ $endDay = $now->endOfMonth()->toDateString();
+
+ $sum_net_amount = ShoppingOrderMargin::whereUserId($user->id)
+ ->whereBetween('from', [$startDay, $endDay])
+ ->wherePaid(true)
+ ->whereCancellation(false)
+ ->sum('net_amount');
+ if($format){
+ $sum_net_amount = Util::formatNumber($sum_net_amount);
+ }
+
+ return $sum_net_amount;
+ }
+
+
+
+ public static function getMontlyPartnerCommission(User $user, $date = null, $format = false){
+
+ $now = $date ? Carbon::parse($date) : Carbon::now();
+ $startDay = $now->startOfMonth()->toDateString();
+ $endDay = $now->endOfMonth()->toDateString();
+
+ $sum_net_amount = ShoppingOrderMargin::whereMSponsorId($user->id)
+ ->whereBetween('from', [$startDay, $endDay])
+ ->wherePaid(true)
+ ->whereCancellation(false)
+ ->sum('net_partner_commission');
+ if($format){
+ $sum_net_amount = Util::formatNumber($sum_net_amount);
+ }
+
+ return $sum_net_amount;
+ }
+ //monthy amount, sum
+
+}
\ No newline at end of file
diff --git a/app/Services/Yard.php b/app/Services/Yard.php
index a333b0b..e61d272 100644
--- a/app/Services/Yard.php
+++ b/app/Services/Yard.php
@@ -3,6 +3,9 @@ namespace App\Services;
use App\Models\Product;
use App\Models\ShippingCountry;
+use App\Services\Yard\Commission;
+use App\Services\Yard\Margin;
+use App\Services\Yard\MarginItems;
use Gloudemans\Shoppingcart\Cart;
use Gloudemans\Shoppingcart\CartItem;
use Gloudemans\Shoppingcart\Contracts\Buyable;
@@ -23,6 +26,13 @@ class Yard extends Cart
private $ysession;
private $yinstance;
private $shopping_data = [];
+ private $user;
+ private $payment_credit;
+
+ private $yard_commission;
+ private $yard_margin;
+
+ private $global_tax_rate = 19;
public function __construct(SessionManager $session, Dispatcher $events)
{
@@ -52,6 +62,25 @@ class Yard extends Cart
$this->shipping_is_for = $this->getYardExtra('shipping_is_for');
}
+ if($this->getYardExtra('shopping_user')){
+ $this->user = $this->getYardExtra('shopping_user');
+ }
+
+ if($this->getYardExtra('user')){
+ $this->user = $this->getYardExtra('user');
+ }
+ if($this->getYardExtra('payment_credit')){
+ $this->payment_credit = $this->getYardExtra('payment_credit');
+ }
+
+ if($this->getYardExtra('yard_commission')){
+ $this->yard_commission = $this->getYardExtra('yard_commission');
+ }
+
+ if($this->getYardExtra('yard_margin')){
+ $this->yard_margin = $this->getYardExtra('yard_margin');
+ }
+
/*if($this->getYardExtra('num_comp')){
$this->num_comp = $this->getYardExtra('num_comp');
}*/
@@ -123,10 +152,111 @@ class Yard extends Cart
}
- public function reCalculateShippingPrice(){
+ public function reCalculate(){
$this->calculateShippingPrice();
}
+ /* * ***** */
+ public function calculateMargins(){
+ //get user monthy amount
+ $monthy_amount = UserMarign::getMontlyAmount($this->user);
+
+ $content = $this->getContent();
+
+ /*single + partner Commissions */
+ //get price net commission, add amount, partner (total) from products is single_commission
+ $yard_commission = new Commission();
+ $yard_commission = $content->reduce(function ($yard_commission, CartItem $cartItem) {
+ $price_net = $cartItem->price / ((100 + $cartItem->taxRate) / 100);
+ if($cartItem->options->single_commission){
+ $value_commission = $price_net / 100 * $cartItem->options->value_commission;
+ $partner_commission = $price_net / 100 * $cartItem->options->partner_commission;
+
+ $price_net_commission = ($cartItem->qty * $price_net) - ($cartItem->qty * $value_commission);
+ $yard_commission->single_price_net += ($cartItem->qty * $price_net);
+ $yard_commission->single_value_commission += ($cartItem->qty * $value_commission);
+ if($this->user->user_level->partner_provision){
+ $yard_commission->single_partner_commission += ($cartItem->qty * $partner_commission);
+ }
+ $yard_commission->single_price_net_commission += $price_net_commission;
+ //
+ if($cartItem->options->amount_commission){
+ $yard_commission->single_amount_commission += $price_net_commission;
+ }
+ }else{
+ $yard_commission->price_net = $yard_commission->price_net + ($cartItem->qty * $price_net);
+ }
+ return $yard_commission;
+ }, $yard_commission);
+
+ $this->yard_commission = $yard_commission;
+ $this->putYardExtra('yard_commission', $this->yard_commission);
+
+ //dump($monthy_amount);
+ //add to $monthy_amount für max level margins
+ $start_monthy_amount = $monthy_amount + $yard_commission->single_amount_commission;
+ $end_monthy_amount = $start_monthy_amount + $yard_commission->price_net;
+
+ //dump($start_monthy_amount);
+ //dump($end_monthy_amount);
+
+ $margin = new Margin();
+ $rest_amount = 0;
+ $range = 0;
+ $price_net = $yard_commission->price_net;
+ if($yard_commission->price_net > 0 && $this->user && $this->user->user_level && $this->user->user_level->user_level_margins){
+ foreach ($this->user->user_level->user_level_margins_re as $user_level_margin) {
+ //total split?
+ if ($end_monthy_amount >= $user_level_margin->price_from) {
+ if(!isset($balance)){
+ if($start_monthy_amount >= $user_level_margin->price_from){
+ $balance = $yard_commission->price_net;
+ $rest_amount = 0;
+ }else{
+ $balance = $end_monthy_amount - $user_level_margin->price_from;
+ $rest_amount = $end_monthy_amount - ($start_monthy_amount + $balance);
+ }
+ }else{
+ $range = $last_limit-$user_level_margin->price_from;
+ if($rest_amount >= $range){
+ $balance = $range;
+ }else{
+ $balance = $rest_amount;
+ }
+ $rest_amount = $rest_amount-$balance;
+ }
+ $last_limit = $user_level_margin->price_from;
+ if($balance != 0){
+ $margin->add($user_level_margin->price_from, [
+ 'price_net' => $price_net,
+ 'range' => $range,
+ 'rest_amount' => $rest_amount,
+ 'balance' => $balance,
+ 'trading_margin'=> $user_level_margin->trading_margin,
+ 'commission'=> $user_level_margin->commission,
+ ]);
+ }
+ }
+ }
+ }
+
+
+ $margin->setCommission($this->yard_commission);
+ $margin->calculate();
+
+ $this->yard_margin = $margin;
+ $this->putYardExtra('yard_margin', $this->yard_margin);
+
+ //dump($margin);
+ }
+
+ public function getYardMargin(){
+ return $this->yard_margin;
+ }
+ public function getYardCommission(){
+ return $this->yard_commission;
+ }
+ /* * ***** */
public function setShippingCountryWithPrice($shipping_country_id, $shipping_is_for = 'ot')
{
$this->shipping_country_id = $shipping_country_id;
@@ -139,6 +269,21 @@ class Yard extends Cart
}
+ public function setShoppingUser($user, $payment_credit = false){
+ $this->user = $user;
+ $this->payment_credit = $payment_credit;
+ $this->putYardExtra('user', $user);
+ $this->putYardExtra('payment_credit', $payment_credit);
+
+ }
+
+ public function getPaymentCredit(){
+ if($this->payment_credit && $this->user->payment_credit > 0){
+ return $this->user->payment_credit;
+ }
+ return 0;
+ }
+
private function calculateShippingPrice(){
$shippingCountry = ShippingCountry::find($this->shipping_country_id);
@@ -151,10 +296,8 @@ class Yard extends Cart
$shipping_price->price = 0;
$shipping_price->price_comp = 0;
}else{
-
-
//first by price
- $shipping_price = $this->shippingPriceByTotal($shipping->shipping_prices, $this->total(2, '.', ''));
+ $shipping_price = $this->shippingPriceBySubTotal($shipping->shipping_prices, $this->subtotal(2, '.', ''));
//sec by weight
if(!$shipping_price){
$shipping_price = $this->shippingPriceByWeight($shipping->shipping_prices, $this->weight());
@@ -186,7 +329,7 @@ class Yard extends Cart
}
}
- private function shippingPriceByTotal($prices, $total){
+ private function shippingPriceBySubTotal($prices, $total){
foreach ($prices as $price){
if($price->total_from > 0 && $price->total_to > 0){
if($total >= $price->total_from && $total <= $price->total_to){
@@ -243,19 +386,56 @@ class Yard extends Cart
public function taxWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null)
{
- $total = $this->totalWithShipping(2, '.', '');
+
+ // $total = $this->totalWithShipping(2, '.', '');
// $totalTax = (float) $this->tax(2, '.', '') + $this->shipping_tax;
- $totalTax = $this->subtotalWithShipping(2, '.', '');
- return $this->numberFormat(($total - $totalTax), $decimals, $decimalPoint, $thousandSeperator);
+ $subtotal_shipping = $this->subtotalWithShipping(2, '.', '');
+ return $this->numberFormat(($subtotal_shipping / 100 * $this->global_tax_rate), $decimals, $decimalPoint, $thousandSeperator);
}
public function totalWithShipping($decimals = null, $decimalPoint = null, $thousandSeperator = null)
{
- $total = (float) ($this->total(2, '.', '')) + $this->shipping_price;
+ //$total = (float) ($this->total(2, '.', '')) + $this->shipping_price;
+ $subtotal_shipping = $this->subtotalWithShipping(2, '.', '');
+ $tax = $subtotal_shipping / 100 * $this->global_tax_rate;
+ $total = ($subtotal_shipping + $tax);
+ if($PaymentCredit = $this->getPaymentCredit()){
+ $total = $total - $PaymentCredit;
+ if($total < 0){
+ $total = 0;
+ }
+ }
return $this->numberFormat($total, $decimals, $decimalPoint, $thousandSeperator);
}
+
+ public function totalWithShippingWithoutCredit($decimals = null, $decimalPoint = null, $thousandSeperator = null)
+ {
+ //$total = (float) ($this->total(2, '.', '')) + $this->shipping_price;
+ $subtotal_shipping = $this->subtotalWithShipping(2, '.', '');
+ $tax = $subtotal_shipping / 100 * $this->global_tax_rate;
+ $total = ($subtotal_shipping + $tax);
+ return $this->numberFormat($total, $decimals, $decimalPoint, $thousandSeperator);
+ }
+
+ public function totalfromCredit($decimals = null, $decimalPoint = null, $thousandSeperator = null)
+ {
+ $rest = 0;
+ if ($PaymentCredit = $this->getPaymentCredit()) {
+ $subtotal_shipping= $this->subtotalWithShipping(2, '.', '');
+ $tax = $subtotal_shipping/ 100 * $this->global_tax_rate;
+ $total = ($subtotal_shipping+ $tax);
+ $rest = $PaymentCredit - $total;
+ if($rest < 0){
+ $rest = $PaymentCredit;
+ }else{
+ $rest = $PaymentCredit - $rest;
+ }
+ }
+ return $this->numberFormat($rest, $decimals, $decimalPoint, $thousandSeperator);
+ }
+
/**
* Get the total price of the items in the cart.
*
@@ -270,7 +450,6 @@ class Yard extends Cart
$total = $content->reduce(function ($total, CartItem $cartItem) {
return $total + ($cartItem->options->weight ? ($cartItem->options->weight*$cartItem->qty) : 0);
}, 0);
-
return $total;
}
@@ -280,7 +459,6 @@ class Yard extends Cart
$total = $content->reduce(function ($total, CartItem $cartItem) {
return $total + ($cartItem->options->points ? ($cartItem->options->points * $cartItem->qty) : 0);
}, 0);
-
return $total;
}
@@ -312,10 +490,8 @@ class Yard extends Cart
if ($withFees === true) {
$fees = $this->feeTotal(null, null, null, true);
-
$total = $total + $fees;
}
-
return $this->numberFormat($total, $decimals, $decimalPoint, $thousandSeperator);
}
@@ -340,7 +516,6 @@ class Yard extends Cart
if ($withFees === true) {
$fees = $this->feeTax();
-
$tax = $tax + floatval($fees);
}
@@ -356,7 +531,7 @@ class Yard extends Cart
* @param string $thousandSeperator
* @return float
*/
- public function subtotal($decimals = null, $decimalPoint = null, $thousandSeperator = null)
+ public function subtotal($decimals = null, $decimalPoint = null, $thousandSeperator = null, $discount = true)
{
$content = $this->getContent();
@@ -365,6 +540,9 @@ class Yard extends Cart
return $subTotal + ($cartItem->qty * $price_net);
}, 0);
+ if($discount && $this->yard_margin){
+ $subTotal -= $this->yard_margin->net_discount;
+ }
return $this->numberFormat($subTotal, $decimals, $decimalPoint, $thousandSeperator);
}
@@ -379,7 +557,17 @@ class Yard extends Cart
if($set_price === 'with'){
$price = $product->getPriceWith(false, true);
}
- $cartItem = $this->getCartItem($product->id, $product->getLang('name'), 1, $price, ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points]);
+ $cartItem = $this->getCartItem($product->id, $product->getLang('name'), 1, $price,
+ [
+ 'image' => $image,
+ 'slug' => $product->slug,
+ 'weight' => $product->weight,
+ 'single_commission' => $product->single_commission,
+ 'amount_commission' => $product->amount_commission,
+ 'value_commission' => $product->value_commission,
+ 'partner_commission' => $product->partner_commission,
+ ]
+ );
$content = $this->getContent();
if ($content->has($cartItem->rowId)){
diff --git a/app/Services/Yard/Commission.php b/app/Services/Yard/Commission.php
new file mode 100644
index 0000000..ebc4b31
--- /dev/null
+++ b/app/Services/Yard/Commission.php
@@ -0,0 +1,34 @@
+price_net = 0;
+ $this->single_price_net = 0;
+ $this->single_amount_commission = 0;
+ $this->single_partner_commission = 0;
+ $this->single_value_commission = 0;
+ $this->single_price_net_commission = 0;
+ }
+
+ public function isCommission(){
+ return ($this->single_value_commission > 0) ? true : false;
+ }
+
+ public function getFormatted($key)
+ {
+ return isset($this->{$key}) ? Util::formatNumber($this->{$key}) : "";
+ }
+}
\ No newline at end of file
diff --git a/app/Services/Yard/Margin.php b/app/Services/Yard/Margin.php
new file mode 100644
index 0000000..b4a9911
--- /dev/null
+++ b/app/Services/Yard/Margin.php
@@ -0,0 +1,104 @@
+items = new Collection;
+ }
+
+ public function add($price_from, $values){
+ $this->items->push(new MarginItems($price_from, $values));
+ }
+
+ public function setCommission(Commission $commission){
+ $this->commission = $commission;
+ }
+ public function isMargin(){
+ return count($this->items) ? true : false;
+ }
+
+ public function calculate(){
+
+ if($this->commission){
+ $this->net_discount += $this->commission->single_value_commission;
+ $this->net_partner_commission += $this->commission->single_partner_commission;
+ $this->net_amount += $this->commission->single_amount_commission;
+ $this->net_price += $this->commission->single_price_net_commission;
+
+ }
+
+ if($this->isMargin()){
+ foreach ($this->items as $item){
+ $this->net_discount += $item->value_margin;
+ $this->net_partner_commission += $item->value_commission;
+ $this->net_amount += $item->new_price_net;
+ $this->net_price += $item->new_price_net;
+ }
+ }
+
+ }
+ public function getFormatted($key)
+ {
+ return isset($this->{$key}) ? Util::formatNumber($this->{$key}) : "";
+ }
+
+
+ public function toArray()
+ {
+ return [
+ 'items' => $this->items,
+ 'commission' => $this->commission,
+ 'net_discount' => $this->net_discount,
+ 'net_partner_commission' => $this->net_partner_commission,
+ 'net_price' => $this->net_price,
+ 'net_amount' => $this->net_amount,
+ ];
+ }
+
+
+ public function restore($content)
+ {
+
+ // Unserialize the content (either array if new, or collection if old)
+ $storedContent = unserialize($content);
+
+ if (is_array($storedContent)) {
+ $this->fromArray($storedContent);
+ }
+ //TODO - check this
+ // If the old approach and is Collection, push into existing items
+ /* if ($storedContent instanceof Collection) {
+ foreach ($storedContent as $item) {
+ $this->items->put($item);
+ }
+ }*/
+
+ }
+
+
+ public function fromArray($array)
+ {
+ $this->items = $array['items'];
+ $this->commission = $array['commission'];
+ $this->net_discount = $array['net_discount'];
+ $this->net_partner_commission = $array['net_partner_commission'];
+ $this->net_price = $array['net_price'];
+ $this->net_amount = $array['net_amount'];
+
+ return $this;
+ }
+
+}
\ No newline at end of file
diff --git a/app/Services/Yard/MarginItems.php b/app/Services/Yard/MarginItems.php
new file mode 100644
index 0000000..757ce24
--- /dev/null
+++ b/app/Services/Yard/MarginItems.php
@@ -0,0 +1,46 @@
+price_from = $price_from;
+ $this->range = $values['range'];
+ $this->rest_amount = $values['rest_amount'];
+ $this->balance = $values['balance'];
+ $this->trading_margin = $values['trading_margin'];
+ $this->commission = $values['commission'];
+ $this->calculate();
+ }
+
+ public function calculate(){
+ $this->value_margin = $this->balance / 100 * $this->trading_margin;
+ $this->new_price_net = $this->balance - $this->value_margin;
+ if($this->commission > 0){
+ $this->value_commission = $this->balance / 100 * $this->commission;
+ }
+ }
+
+
+
+ public function getFormatted($key)
+ {
+ return isset($this->{$key}) ? Util::formatNumber($this->{$key}) : "";
+ }
+}
\ No newline at end of file
diff --git a/app/User.php b/app/User.php
index 41e88d5..66044cc 100644
--- a/app/User.php
+++ b/app/User.php
@@ -96,6 +96,8 @@ use Util;
* @property string|null $payment_account
* @property-read \App\Models\UserLevel|null $next_user_level
* @method static \Illuminate\Database\Eloquent\Builder|User wherePaymentAccount($value)
+ * @property string|null $payment_credit
+ * @method static \Illuminate\Database\Eloquent\Builder|User wherePaymentCredit($value)
*/
class User extends Authenticatable
{
diff --git a/database/migrations/2018_09_30_165917_create_user_levels_table.php b/database/migrations/2018_09_30_165917_create_user_levels_table.php
index c15174f..4974330 100644
--- a/database/migrations/2018_09_30_165917_create_user_levels_table.php
+++ b/database/migrations/2018_09_30_165917_create_user_levels_table.php
@@ -21,6 +21,8 @@ class CreateUserLevelsTable extends Migration
$table->text('content')->nullable();
$table->text('trans_content')->nullable();
+ $table->boolean('partner_provision')->default(false);
+
$table->tinyInteger('pos')->unsigned()->nullable();
$table->boolean('active')->default(false);
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 1de155f..2b193bd 100644
--- a/database/migrations/2018_10_21_164001_create_products_table.php
+++ b/database/migrations/2018_10_21_164001_create_products_table.php
@@ -61,7 +61,12 @@ class CreateProductsTable extends Migration
$table->tinyInteger('show_at')->unsigned()->nullable()->default(0);
- $table->boolean('shipping_addon')->default(false);
+ $table->tinyInteger('amount_commission')->unsigned()->nullable()->default(0);
+
+ $table->boolean('single_commission')->default(false);
+ $table->decimal('value_commission', 5, 2)->nullable();
+ $table->decimal('partner_commission', 5, 2)->nullable();
+
$table->string('identifier', 20)->nullable();
$table->string('action')->nullable();
diff --git a/database/migrations/2020_07_25_131854_create_payment_methods_table.php b/database/migrations/2020_07_25_131854_create_payment_methods_table.php
index fbd649f..57a2a27 100644
--- a/database/migrations/2020_07_25_131854_create_payment_methods_table.php
+++ b/database/migrations/2020_07_25_131854_create_payment_methods_table.php
@@ -19,6 +19,8 @@ class CreatePaymentMethodsTable extends Migration
$table->string('short', 10);
$table->unsignedTinyInteger('show_at')->nullable()->default(0);
$table->unsignedTinyInteger('pos')->nullable()->default(0);
+ $table->decimal('max_price', 8, 2)->nullable();
+
$table->boolean('active')->default(false);
$table->boolean('default')->default(false);
diff --git a/database/migrations/2020_12_23_163527_create_shopping_orders_table.php b/database/migrations/2020_12_23_163527_create_shopping_orders_table.php
index 8b95b54..42eb071 100644
--- a/database/migrations/2020_12_23_163527_create_shopping_orders_table.php
+++ b/database/migrations/2020_12_23_163527_create_shopping_orders_table.php
@@ -26,13 +26,19 @@ class CreateShoppingOrdersTable extends Migration
$table->unsignedTinyInteger('payment_for')->nullable();
$table->decimal('total', 13, 2)->nullable();
+ $table->decimal('subtotal_full', 13, 2)->nullable();
+ $table->decimal('discount', 13, 2)->nullable();
$table->decimal('subtotal', 13, 2)->nullable();
+
$table->decimal('shipping', 8, 2)->nullable();
$table->decimal('shipping_net', 8, 2)->nullable();
- $table->decimal('subtotal_ws', 13, 2)->nullable();
+ $table->decimal('subtotal_shipping', 13, 2)->nullable();
$table->decimal('tax', 8, 2)->nullable();
+
+ $table->decimal('total_without_credit', 13, 2)->nullable();
+ $table->decimal('payment_credit', 13, 2)->nullable();
$table->decimal('total_shipping', 13, 2)->nullable();
$table->unsignedInteger('points')->nullable();
@@ -47,7 +53,6 @@ class CreateShoppingOrdersTable extends Migration
$table->unsignedTinyInteger('shipped')->default(0);
$table->string('tracking', 255)->nullable();
-
$table->char('mode', 4)->nullable();
$table->timestamps();
diff --git a/database/migrations/2021_01_19_140551_create_user_level_margins_table.php b/database/migrations/2021_01_19_140551_create_user_level_margins_table.php
new file mode 100644
index 0000000..48444dd
--- /dev/null
+++ b/database/migrations/2021_01_19_140551_create_user_level_margins_table.php
@@ -0,0 +1,44 @@
+id();
+ $table->unsignedInteger('user_level_id');
+
+ $table->decimal('price_from', 8, 2)->nullable();
+ //$table->decimal('price_to', 8, 2)->nullable();
+
+ $table->decimal('trading_margin', 5, 2)->nullable();
+ $table->decimal('commission', 5, 2)->nullable();
+
+ $table->timestamps();
+
+ $table->foreign('user_level_id')
+ ->references('id')
+ ->on('user_levels')
+ ->onDelete('cascade');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('user_level_margins');
+ }
+}
diff --git a/database/migrations/2021_01_21_170707_create_shopping_order_margins_table.php b/database/migrations/2021_01_21_170707_create_shopping_order_margins_table.php
new file mode 100644
index 0000000..ba05c86
--- /dev/null
+++ b/database/migrations/2021_01_21_170707_create_shopping_order_margins_table.php
@@ -0,0 +1,64 @@
+id();
+ $table->unsignedInteger('shopping_order_id');
+ $table->unsignedInteger('user_id');
+
+ $table->decimal('net_price', 13, 2)->nullable();
+ $table->decimal('net_discount', 13, 2)->nullable();
+ $table->decimal('net_amount', 13, 2)->nullable();
+ $table->decimal('from_payment_credit', 13, 2)->nullable();
+
+ $table->unsignedInteger('m_sponsor_id')->nullable();
+ $table->decimal('net_partner_commission', 13, 2)->nullable();
+
+ $table->date('from')->nullable();
+
+ $table->boolean('paid')->default(false);
+ $table->boolean('cancellation')->default(false);
+ $table->unsignedTinyInteger('status')->index()->default(0);
+
+
+ $table->text('content')->nullable();
+
+ $table->timestamps();
+
+
+ $table->foreign('shopping_order_id')
+ ->references('id')
+ ->on('shopping_orders');
+
+ $table->foreign('user_id')
+ ->references('id')
+ ->on('users');
+
+ $table->foreign('m_sponsor_id')
+ ->references('id')
+ ->on('users');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('shopping_order_margins');
+ }
+}
diff --git a/public/css/mycolors.css b/public/css/mycolors.css
new file mode 100644
index 0000000..a49757f
--- /dev/null
+++ b/public/css/mycolors.css
@@ -0,0 +1,102 @@
+body {
+ line-height: 1.2em;
+}
+.text-muted {
+ color: #8e8f90 !important;
+}
+.btn-primary:hover {
+ background: #5f7567;
+}
+.btn-primary:focus,
+.btn-primary.focus {
+ background: #5f7567;
+}
+a {
+ color: #46564d;
+}
+
+
+a:hover {
+ color: #5f7567;
+}
+
+.alert-success {
+ border-color: #f2ffeb;
+ background-color: #b5c49b;
+ color: #f2ffea;
+}
+
+.mr-lg-1-5 {
+ margin-right: 1rem !important;
+}
+
+#accordion a.card-header {
+ background: #fff;
+ padding: 0.6rem 1.5rem;
+}
+
+#accordion a.card-header:hover, #accordion a.card-header:focus {
+ background: #fff;
+}
+
+.text-dark[href]:hover {
+ color: #696f5b !important
+}
+
+#accordion .card-body {
+ font-size: 0.95em;
+}
+.user-view-table tr td:first-child {
+ width: 220px;
+}
+
+.table th, .table td {
+ border-top: 1px solid #d6d6de;
+}
+.btn {
+ font-weight: 500;
+}
+
+.footer.bg-white .footer-link:hover, .footer.bg-white .footer-link:focus {
+ color: rgba(0, 0, 0, 0.9);
+ text-decoration: underline;
+
+}
+.footer.bg-white .footer-link {
+ color: rgba(0, 0, 0, 1);
+ text-decoration: none;
+
+}
+.footer p {
+ color:#000;
+}
+.footer.bg-white {
+ background-color: #fff !important;
+}
+.footer a {
+ color:#000;
+
+}
+.footer a:hover {
+ text-decoration: underline;
+}
+
+.badge-success {
+ background-color: #b5c49b;
+ color: #fff;
+}
+
+.form-control.has-error {
+ border: 1px solid #ea8e49;
+}
+.text-dark.active {
+ color: #fff !important;
+ background-color: #928876 !important;
+}
+
+[data-toggle="collapse"].collapsed .if-not-collapsed {
+ display: none;
+}
+[data-toggle="collapse"]:not(.collapsed) .if-collapsed {
+ display: none;
+}
\ No newline at end of file
diff --git a/public/css/theme-corporate.css b/public/css/theme-corporate.css
new file mode 100644
index 0000000..dbbb01c
--- /dev/null
+++ b/public/css/theme-corporate.css
@@ -0,0 +1,1346 @@
+body {
+ background: #f4f1ef;
+}
+
+.bg-body {
+ background: #f4f1ef !important;
+}
+
+.text-primary {
+ color: #46564d !important;
+}
+
+a.text-primary:hover,
+a.text-primary:focus {
+ color: #5f7567 !important;
+}
+
+.bg-primary {
+ background-color: #46564d !important;
+}
+
+a.bg-primary:hover,
+a.bg-primary:focus {
+ background-color: #5f7567 !important;
+}
+
+.bg-primary-dark {
+ background-color: #5f5442 !important;
+}
+
+a.bg-primary-dark:hover,
+a.bg-primary-dark:focus {
+ background-color: #796f55 !important;
+}
+
+.bg-primary-darker {
+ background-color: #5f5442 !important;
+}
+
+a.bg-primary-darker:hover,
+a.bg-primary-darker:focus {
+ background-color: #796f55 !important;
+}
+
+html:not([dir=rtl]) .border-primary,
+html[dir=rtl] .border-primary {
+ border-color: #46564d !important;
+}
+
+.badge-primary {
+ background-color: #46564d;
+ color: #fff;
+}
+
+.badge-primary[href]:hover,
+.badge-primary[href]:focus {
+ background-color: #928876;
+ color: #fff;
+ text-decoration: none;
+}
+
+.btn .badge-primary {
+ background: #46564d !important;
+ border-color: #46564d !important;
+ color: #fff !important;
+}
+
+.badge-outline-primary {
+ background-color: transparent;
+ box-shadow: 0 0 0 1px #46564d inset;
+ color: #46564d;
+}
+
+.badge-outline-primary[href]:hover,
+.badge-outline-primary[href]:focus {
+ color: #46564d;
+ text-decoration: none;
+}
+
+.btn .badge-outline-primary {
+ background-color: transparent !important;
+ box-shadow: 0 0 0 1px #46564d inset !important;
+ color: #46564d !important;
+}
+
+.page-item.active .page-link,
+.page-item.active .page-link:hover,
+.page-item.active .page-link:focus,
+.pagination li.active > a:not(.page-link),
+.pagination li.active > a:not(.page-link):hover,
+.pagination li.active > a:not(.page-link):focus {
+ border-color: #46564d;
+ background-color: #46564d;
+ color: #fff;
+}
+
+.progress-bar {
+ background-color: #46564d;
+ color: #fff;
+}
+
+.list-group-item-primary {
+ border-color: rgba(0, 0, 0, 0.07);
+ background-color: #e9f8ff;
+ color: #5d6366;
+}
+
+a.list-group-item-primary,
+button.list-group-item-primary {
+ color: #5d6366;
+}
+
+a.list-group-item-primary:hover,
+a.list-group-item-primary:focus,
+button.list-group-item-primary:hover,
+button.list-group-item-primary:focus {
+ background-color: #e7f6fc;
+ color: #5d6366;
+}
+
+a.list-group-item-primary.active,
+button.list-group-item-primary.active {
+ border-color: #46564d;
+ background-color: #46564d;
+ color: #fff;
+}
+
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+ border-color: #46564d;
+ background-color: #46564d;
+ color: #fff;
+}
+
+.alert-primary {
+ border-color: #d1e5f0;
+ background-color: #def4ff;
+ color: #596266;
+}
+
+.alert-primary hr {
+ border-top-color: #d1e5f0;
+}
+
+.alert-primary .alert-link {
+ color: #596266;
+}
+
+.alert-dark-primary {
+ background-color: #46564d;
+ color: #fff;
+}
+
+.alert-dark-primary hr {
+ border-top-color: rgba(255, 255, 255, 0.2);
+}
+
+.alert-dark-primary .close,
+.alert-dark-primary .alert-link {
+ color: #fff;
+}
+
+.callout-primary {
+ border-color: #46564d !important;
+ background-color: #def4ff;
+ color: #596266;
+}
+
+.callout-primary .callout-link {
+ color: #596266;
+}
+
+.tooltip-primary .tooltip-inner,
+.tooltip-primary > .tooltip .tooltip-inner,
+.ngb-tooltip-primary + ngb-tooltip-window .tooltip-inner {
+ background: #46564d;
+ color: #fff;
+}
+
+.tooltip-primary.bs-tooltip-top .arrow::before,
+.tooltip-primary.bs-tooltip-auto[x-placement^="top"] .arrow::before,
+.tooltip-primary > .tooltip.bs-tooltip-top .arrow::before,
+.tooltip-primary > .tooltip.bs-tooltip-auto[x-placement^="top"] .arrow::before,
+.ngb-tooltip-primary + ngb-tooltip-window.bs-tooltip-top .arrow::before,
+.ngb-tooltip-primary + ngb-tooltip-window.bs-tooltip-auto[x-placement^="top"] .arrow::before {
+ border-top-color: #46564d;
+}
+
+.tooltip-primary.bs-tooltip-right .arrow::before,
+.tooltip-primary.bs-tooltip-auto[x-placement^="right"] .arrow::before,
+.tooltip-primary > .tooltip.bs-tooltip-right .arrow::before,
+.tooltip-primary > .tooltip.bs-tooltip-auto[x-placement^="right"] .arrow::before,
+.ngb-tooltip-primary + ngb-tooltip-window.bs-tooltip-right .arrow::before,
+.ngb-tooltip-primary + ngb-tooltip-window.bs-tooltip-auto[x-placement^="right"] .arrow::before {
+ border-right-color: #46564d;
+}
+
+.tooltip-primary.bs-tooltip-bottom .arrow::before,
+.tooltip-primary.bs-tooltip-auto[x-placement^="bottom"] .arrow::before,
+.tooltip-primary > .tooltip.bs-tooltip-bottom .arrow::before,
+.tooltip-primary > .tooltip.bs-tooltip-auto[x-placement^="bottom"] .arrow::before,
+.ngb-tooltip-primary + ngb-tooltip-window.bs-tooltip-bottom .arrow::before,
+.ngb-tooltip-primary + ngb-tooltip-window.bs-tooltip-auto[x-placement^="bottom"] .arrow::before {
+ border-bottom-color: #46564d;
+}
+
+.tooltip-primary.bs-tooltip-left .arrow::before,
+.tooltip-primary.bs-tooltip-auto[x-placement^="left"] .arrow::before,
+.tooltip-primary > .tooltip.bs-tooltip-left .arrow::before,
+.tooltip-primary > .tooltip.bs-tooltip-auto[x-placement^="left"] .arrow::before,
+.ngb-tooltip-primary + ngb-tooltip-window.bs-tooltip-left .arrow::before,
+.ngb-tooltip-primary + ngb-tooltip-window.bs-tooltip-auto[x-placement^="left"] .arrow::before {
+ border-left-color: #46564d;
+}
+
+.popover-primary,
+.popover-primary > .popover,
+.ngb-popover-primary + ngb-popover-window {
+ border-color: transparent;
+ background: #46564d;
+}
+
+.popover-primary .popover-header,
+.popover-primary > .popover .popover-header,
+.ngb-popover-primary + ngb-popover-window .popover-header {
+ border-color: rgba(255, 255, 255, 0.2);
+ background: transparent;
+ color: #fff;
+}
+
+.popover-primary .popover-body,
+.popover-primary > .popover .popover-body,
+.ngb-popover-primary + ngb-popover-window .popover-body {
+ background: transparent;
+ color: #fff;
+}
+
+.popover-primary > .arrow::before,
+.popover-primary > .popover > .arrow::before,
+.ngb-popover-primary + ngb-popover-window > .arrow::before {
+ border-color: transparent;
+}
+
+.popover-primary.bs-popover-top > .arrow::after,
+.popover-primary.bs-popover-auto[x-placement^="top"] > .arrow::after,
+.popover-primary > .popover.bs-popover-top > .arrow::after,
+.popover-primary > .popover.bs-popover-auto[x-placement^="top"] > .arrow::after,
+.ngb-popover-primary + ngb-popover-window.bs-popover-top > .arrow::after,
+.ngb-popover-primary + ngb-popover-window.bs-popover-auto[x-placement^="top"] > .arrow::after {
+ border-top-color: #46564d;
+}
+
+.popover-primary.bs-popover-right > .arrow::after,
+.popover-primary.bs-popover-auto[x-placement^="right"] > .arrow::after,
+.popover-primary > .popover.bs-popover-right > .arrow::after,
+.popover-primary > .popover.bs-popover-auto[x-placement^="right"] > .arrow::after,
+.ngb-popover-primary + ngb-popover-window.bs-popover-right > .arrow::after,
+.ngb-popover-primary + ngb-popover-window.bs-popover-auto[x-placement^="right"] > .arrow::after {
+ border-right-color: #46564d;
+}
+
+.popover-primary.bs-popover-bottom > .arrow::after,
+.popover-primary.bs-popover-auto[x-placement^="bottom"] > .arrow::after,
+.popover-primary > .popover.bs-popover-bottom > .arrow::after,
+.popover-primary > .popover.bs-popover-auto[x-placement^="bottom"] > .arrow::after,
+.ngb-popover-primary + ngb-popover-window.bs-popover-bottom > .arrow::after,
+.ngb-popover-primary + ngb-popover-window.bs-popover-auto[x-placement^="bottom"] > .arrow::after {
+ border-bottom-color: #46564d;
+}
+
+.popover-primary.bs-popover-left > .arrow::after,
+.popover-primary.bs-popover-auto[x-placement^="left"] > .arrow::after,
+.popover-primary > .popover.bs-popover-left > .arrow::after,
+.popover-primary > .popover.bs-popover-auto[x-placement^="left"] > .arrow::after,
+.ngb-popover-primary + ngb-popover-window.bs-popover-left > .arrow::after,
+.ngb-popover-primary + ngb-popover-window.bs-popover-auto[x-placement^="left"] > .arrow::after {
+ border-left-color: #46564d;
+}
+
+.table .table-primary,
+.table .table-primary > th,
+.table .table-primary > td {
+ border-color: rgba(0, 0, 0, 0.035) !important;
+ background-color: #e9f8ff;
+ color: #5d6366;
+}
+
+.table-hover .table-primary:hover,
+.table-hover .table-primary:hover > td,
+.table-hover .table-primary:hover > th {
+ background-color: #e7f6fc;
+}
+
+.btn-primary, .btn-submit {
+ border-color: transparent;
+ background: #46564d;
+ color: #fff;
+}
+
+.btn-primary:hover, .btn-submit:hover {
+ border-color: transparent;
+ background: #928876;
+ color: #fff;
+}
+
+.btn-primary:focus,
+.btn-primary.focus,
+.btn-submit:focus,
+.btn-submit.focus {
+ box-shadow: 0 0 0 2px rgba(38, 180, 255, 0.4);
+}
+
+.btn-primary.disabled,
+.btn-primary:disabled {
+ border-color: transparent !important;
+ background: #46564d !important;
+ box-shadow: none !important;
+ color: #fff !important;
+}
+
+.btn-primary .badge {
+ background: #fff;
+ color: #46564d;
+}
+
+.btn-primary:active,
+.btn-primary.active,
+.show > .btn-primary.dropdown-toggle {
+ border-color: transparent;
+ background: #46564d;
+ box-shadow: none;
+}
+
+.btn-group .btn-primary,
+.input-group-prepend .btn-primary,
+.input-group-append .btn-primary {
+ border-right: 1px solid #46564d;
+ border-left: 1px solid #46564d;
+}
+
+.btn-outline-primary {
+ border-color: #46564d;
+ background: transparent;
+ color: #46564d;
+}
+
+.btn-outline-primary:hover {
+ border-color: transparent;
+ background: #46564d;
+ color: #fff;
+}
+
+.btn-outline-primary:focus,
+.btn-outline-primary.focus {
+ box-shadow: 0 0 0 2px rgba(70, 86, 77, 0.4);
+}
+
+.btn-outline-primary.disabled,
+.btn-outline-primary:disabled {
+ border-color: #46564d !important;
+ background: transparent !important;
+ color: #46564d !important;
+}
+
+.btn-outline-primary:active,
+.btn-outline-primary.active,
+.show > .btn-outline-primary.dropdown-toggle {
+ border-color: transparent;
+ background: #928876;
+ color: #fff;
+ box-shadow: none;
+}
+
+.btn-outline-primary .badge {
+ background: #46564d;
+ border-color: #46564d;
+ color: #fff;
+}
+
+.btn-outline-primary:hover .badge,
+.btn-outline-primary:focus .badge,
+.btn-outline-primary:active .badge,
+.btn-outline-primary.active .badge,
+.show > .btn-outline-primary.dropdown-toggle .badge {
+ background: #fff;
+ border-color: #fff;
+ color: #46564d;
+}
+
+.btn-secondary {
+ border-color: transparent;
+ background: #928876;
+ color: #fff;
+}
+
+.btn-secondary:hover {
+ border-color: transparent;
+ background: #6d6759;
+ color: #fff;
+}
+
+.btn-secondary:focus,
+.btn-secondary.focus {
+ box-shadow: 0 0 0 2px rgba(146, 136, 118, 0.4);
+}
+
+.btn-secondary.disabled,
+.btn-secondary:disabled {
+ border-color: transparent !important;
+ background: #cabda4 !important;
+ box-shadow: none !important;
+ color: #fff !important;
+}
+
+.btn-secondary .badge {
+ background: #fff;
+ color: #928876;
+}
+
+.btn-secondary:active,
+.btn-secondary.active,
+.show > .btn-secondary.dropdown-toggle {
+ border-color: transparent;
+ background: #928876;
+ box-shadow: none;
+}
+
+.btn-group .btn-secondary,
+.input-group-prepend .btn-secondary,
+.input-group-append .btn-secondary {
+ border-right: 1px solid #928876;
+ border-left: 1px solid #928876;
+}
+
+.btn-outline-secondary {
+ border-color: #928876;
+ background: transparent;
+ color: #928876;
+}
+
+.btn-outline-secondary:hover {
+ border-color: transparent;
+ background: #928876;
+ color: #fff;
+}
+
+.btn-outline-secondary:focus,
+.btn-outline-secondary.focus {
+ box-shadow: 0 0 0 2px rgba(136, 151, 170, 0.4);
+}
+
+.btn-outline-secondary.disabled,
+.btn-outline-secondary:disabled {
+ border-color: #928876 !important;
+ background: transparent !important;
+ color: #928876 !important;
+}
+
+.btn-outline-secondary:active,
+.btn-outline-secondary.active,
+.show > .btn-outline-secondary.dropdown-toggle {
+ border-color: transparent;
+ background: #818fa2;
+ color: #fff;
+ box-shadow: none;
+}
+
+.btn-outline-secondary .badge {
+ background: #928876;
+ border-color: #928876;
+ color: #fff;
+}
+
+.btn-outline-secondary:hover .badge,
+.btn-outline-secondary:focus .badge,
+.btn-outline-secondary:active .badge,
+.btn-outline-secondary.active .badge,
+.show > .btn-outline-secondary.dropdown-toggle .badge {
+ background: #fff;
+ border-color: #fff;
+ color: #928876;
+}
+
+.dropdown-item:not(.disabled).active,
+.dropdown-item:not(.disabled):active {
+ background-color: #46564d;
+ color: #fff;
+}
+
+.dropdown-menu > li:not(.disabled) > a:not(.dropdown-item):active,
+.dropdown-menu > li.active:not(.disabled) > a:not(.dropdown-item) {
+ background-color: #46564d;
+ color: #fff;
+}
+
+.nav-pills .nav-link.active,
+.nav-pills .nav-link.active:hover,
+.nav-pills .nav-link.active:focus {
+ background-color: #46564d;
+ color: #fff;
+}
+
+.tabs-alt.nav-tabs .nav-link.active,
+.tabs-alt.nav-tabs .nav-link.active:hover,
+.tabs-alt.nav-tabs .nav-link.active:focus,
+.tabs-alt > .nav-tabs .nav-link.active,
+.tabs-alt > .nav-tabs .nav-link.active:hover,
+.tabs-alt > .nav-tabs .nav-link.active:focus {
+ box-shadow: 0 -2px 0 #46564d inset;
+}
+
+.custom-control .custom-control-input:focus ~ .custom-control-label::before,
+.custom-control .custom-control-input:active ~ .custom-control-label::before {
+ border-color: #46564d;
+}
+
+.custom-control .custom-control-input:focus ~ .custom-control-label::before {
+ box-shadow: 0 0 0 2px rgba(38, 180, 255, 0.4);
+}
+
+.custom-control.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before,
+.custom-control.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before,
+.custom-control.custom-radio .custom-control-input:checked ~ .custom-control-label::before {
+ border-color: #46564d;
+ background-color: #46564d;
+}
+
+.custom-control.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E");
+}
+
+.custom-control.custom-checkbox .custom-control-input:checked ~ .custom-control-label::before {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 9.5 7.5'%3E%3Cpolyline points='0.75 4.35 4.18 6.75 8.75 0.75' style='fill:none;stroke:%23fff;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px'/%3E%3C/svg%3E");
+}
+
+.custom-control.custom-radio .custom-control-input:checked ~ .custom-control-label::before {
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E");
+}
+
+.custom-file-input:focus ~ .custom-file-label {
+ border-color: #46564d;
+}
+
+.custom-file-input:focus ~ .custom-file-label::after {
+ border-color: inherit;
+}
+
+.form-control:focus,
+.form-control.focus,
+.custom-select:focus {
+ border-color: #46564d;
+}
+
+.switcher-input:checked ~ .switcher-indicator {
+ background: #46564d;
+ color: #fff;
+}
+
+.switcher-input:focus ~ .switcher-indicator {
+ box-shadow: 0 0 0 2px rgba(38, 180, 255, 0.4);
+}
+
+.switcher-input:active ~ .switcher-indicator {
+ box-shadow: none;
+}
+
+.navbar.bg-primary {
+ background-color: #46564d !important;
+ color: #daf2ff;
+}
+
+.navbar.bg-primary .navbar-brand {
+ color: #fff;
+}
+
+.navbar.bg-primary .navbar-brand:hover,
+.navbar.bg-primary .navbar-brand:focus {
+ color: #fff;
+}
+
+.navbar.bg-primary .navbar-nav .nav-link {
+ color: #daf2ff;
+}
+
+.navbar.bg-primary .navbar-nav .nav-link:hover,
+.navbar.bg-primary .navbar-nav .nav-link:focus {
+ color: #fff;
+}
+
+.navbar.bg-primary .navbar-nav .nav-link.disabled {
+ color: #92d9ff !important;
+}
+
+.navbar.bg-primary .navbar-nav .show > .nav-link,
+.navbar.bg-primary .navbar-nav .active > .nav-link,
+.navbar.bg-primary .navbar-nav .nav-link.show,
+.navbar.bg-primary .navbar-nav .nav-link.active {
+ color: #fff;
+}
+
+.navbar.bg-primary .navbar-toggler {
+ color: #daf2ff;
+ border-color: rgba(255, 255, 255, 0.15);
+}
+
+.navbar.bg-primary .navbar-toggler-icon {
+ background-image: url("data:image/svg+xml,
{{__('Berater-Mitgliedschaft aktiv')}} {{__('bis zum:')}}
+ {{__('Vertriebspartner-Mitgliedschaft aktiv')}} {{__('bis zum:')}}
-
{{__('Berater-Account inaktiv')}}
+
{{__('Vertriebspartner-Account inaktiv')}}
@if($user->payment_account)
{{__('abgelaufen am')}}:
{{ $user->getPaymentAccountDateFormat() }}
@endif
@@ -167,11 +167,11 @@
@if($user->isActiveShop())
{{__('Berater-Online-Shop aktiv')}} {{__('bis zum')}}:
+
{{__('Vertriebspartner-Online-Shop aktiv')}} {{__('bis zum')}}:
{{ $user->getPaymentShopDateFormat() }}
@else
-
{{__('Berater-Shop inaktiv')}}
+
{{__('Vertriebspartner-Shop inaktiv')}}
@if($user->payment_shop)
{{__('abgelaufen am')}}:
{{ $user->getPaymentShopDateFormat() }}
@endif
@@ -235,7 +235,7 @@
@if($user->active == 1)
@if($user->files->count())
@foreach($user->files()->whereIdentifier('contract')->get() as $file)
-
+
@endforeach
@endif
diff --git a/resources/views/_bak/web/start.blade.php b/resources/views/_bak/web/start.blade.php
index 9a20c4a..669cfc6 100644
--- a/resources/views/_bak/web/start.blade.php
+++ b/resources/views/_bak/web/start.blade.php
@@ -109,7 +109,7 @@
jeder aktiv eine kluge Entscheidung für Gesundheit und Umwelt.
Wir legen nicht nur auf die Qualität unserer Produkte einen hohen Stellenwert, sondern natürlich auch
- auf umfassende, kompetente Beratung durch freundliche und fachkundige Berater und Beraterinnen.
+ auf umfassende, kompetente Beratung durch freundliche und fachkundige Vertriebspartner und Vertriebspartnerinnen.
Wir entwickeln und vertreiben ausschließlich Produkte, die qualitativ hochwertig sind. So sind sie
bei sachgemäßer Anwendung und Pflege langlebig und sehr ergiebig. Faktoren, die uns die
diff --git a/resources/views/_bak/web/templates/card.blade.php b/resources/views/_bak/web/templates/card.blade.php
index ef8df5f..3d48be7 100644
--- a/resources/views/_bak/web/templates/card.blade.php
+++ b/resources/views/_bak/web/templates/card.blade.php
@@ -344,7 +344,7 @@
-
+
diff --git a/resources/views/_bak/web/templates/datenschutz.blade.php b/resources/views/_bak/web/templates/datenschutz.blade.php
index 5d62e18..0b8f5c8 100644
--- a/resources/views/_bak/web/templates/datenschutz.blade.php
+++ b/resources/views/_bak/web/templates/datenschutz.blade.php
@@ -85,7 +85,7 @@ Bei jedem Aufruf unserer Website werden allgemeine Daten und Informationen erfas
Wir benötigen diese Informationen, um die Inhalte unserer Website zutreffend bereitstellen zu können. die dauerhafte Funktionsfähigkeit unseres IT-Systems gewährleisten zu können und um im Falle eines Cyberangriffes den Behörden die zu einer Strafverfolgung notwendigen Informationen bereitstellen zu können. Hierin liegt auch unser berechtigtes Interesse im Rahmen der Rechtsgrundlage für die Verarbeitung dieser Daten gemäß Art. 6 Abs. 1 lit. f DSGVO. Bei der Nutzung dieser allgemeinen Daten und Informationen ziehen wir keine Rückschlüsse auf die betroffene Person. Die anonymen Daten der Server-Logfiles speichern wir getrennt von allen personenbezogenen Daten.
V. Elektronische Kontaktaufnahme mit uns
Schulung auf der Mallorca Farm
-
Zweimal jährlich veranstaltet MIVITA eine Schulung für Berater. Neben Eurer Begehung der Farm
+
Zweimal jährlich veranstaltet MIVITA eine Schulung für Vertriebspartner. Neben Eurer Begehung der Farm
und Produktionsstätte, weiht Euch Farmbetreiber Werner Telwest in die Geheimnisse der
„Wüstenlilie“ ein. Und das Beste: Zu jeder Schulung gibt es eine Ausschreibung. Wer
entsprechend Umsatz generiert wird mit der Reise von MIVITA belohnt und fliegt FOR FREE auf
diff --git a/resources/views/_bak/web/templates/partner.blade.php b/resources/views/_bak/web/templates/partner.blade.php
index 11a29ed..2467de8 100644
--- a/resources/views/_bak/web/templates/partner.blade.php
+++ b/resources/views/_bak/web/templates/partner.blade.php
@@ -57,7 +57,7 @@
MIVITA Reisen by NETWORKTRIPS
-
Wir legen jedem Berater ans Herz, mit uns gemeinsam die Aloe Vera Schulung auf Mallorca zu erleben. Hierzu haben wir für Euch gemeinsam mit unserem Reise-Portal NETWORKTRIPS und angeschlossenem Reisebüro STERN TOURS in Berlin verschiedene Buchungsmöglichkeiten für
Wir legen jedem Vertriebspartner ans Herz, mit uns gemeinsam die Aloe Vera Schulung auf Mallorca zu erleben. Hierzu haben wir für Euch gemeinsam mit unserem Reise-Portal NETWORKTRIPS und angeschlossenem Reisebüro STERN TOURS in Berlin verschiedene Buchungsmöglichkeiten für
Insbesondere im Direktvertrieb mit seinen Möglichkeiten der freien Zeiteinteilung und
passivem Einkommen hast Du mittelfristig soviel Freiheit, wie es Dir ein fester Job
nicht
- bieten kann. Als selbständige MIVITA Beraterin entscheidest Du selbst, wann und wo Du
+ bieten kann. Als selbständige MIVITA Vertriebspartnerin entscheidest Du selbst, wann und wo Du
arbeitest. Und das betrifft ja nicht nur junge Eltern. Auch für Menschen, die ihre
Familienangehörigen pflegen müssen oder einfach grundsätzlich mehr Zeit und finanzielle
Entlastung erreichen wollen, stellt der Direktvertrieb eine perfekte Lösung dar:
diff --git a/resources/views/_bak/web/templates/vorteile.blade.php b/resources/views/_bak/web/templates/vorteile.blade.php
index 12c4fc5..df00a0f 100644
--- a/resources/views/_bak/web/templates/vorteile.blade.php
+++ b/resources/views/_bak/web/templates/vorteile.blade.php
@@ -54,7 +54,7 @@
Vorteile bei MIVITA:
-
Es gibt sehr viele gute Gründe, um sich mit mivita selbständig zu machen. Viele Beraterinnen und Beratern antworten auf die Frage, warum sie sich für den Direktvertrieb bei mivita entschieden haben:
+
Es gibt sehr viele gute Gründe, um sich mit mivita selbständig zu machen. Viele Vertriebspartnerinnen und Vertriebspartnern antworten auf die Frage, warum sie sich für den Direktvertrieb bei mivita entschieden haben:
20-40% Verkaufsmarge
Attraktive Boni und Aktionen
diff --git a/resources/views/_bak/web/user/start.blade.php b/resources/views/_bak/web/user/start.blade.php
index 56db327..e9cb95b 100644
--- a/resources/views/_bak/web/user/start.blade.php
+++ b/resources/views/_bak/web/user/start.blade.php
@@ -241,7 +241,7 @@
jeder aktiv eine kluge Entscheidung für Gesundheit und Umwelt.
Wir legen nicht nur auf die Qualität unserer Produkte einen hohen Stellenwert, sondern natürlich auch
- auf umfassende, kompetente Beratung durch freundliche und fachkundige Berater und Beraterinnen.
+ auf umfassende, kompetente Beratung durch freundliche und fachkundige Vertriebspartner und Vertriebspartnerinnen.
Wir entwickeln und vertreiben ausschließlich Produkte, die qualitativ hochwertig sind. So sind sie
bei sachgemäßer Anwendung und Pflege langlebig und sehr ergiebig. Faktoren, die uns die
diff --git a/resources/views/admin/customer/_detail.blade.php b/resources/views/admin/customer/_detail.blade.php
index acf8ee6..af7b802 100644
--- a/resources/views/admin/customer/_detail.blade.php
+++ b/resources/views/admin/customer/_detail.blade.php
@@ -70,14 +70,14 @@
@endif
- Zugewiesener Berater
+ Zugewiesener Vertriebspartner
@if($shopping_user->is_like)
-
ist Berater
+
ist Vertriebspartner
@if($shopping_user->auth_user)
diff --git a/resources/views/admin/customer/index.blade.php b/resources/views/admin/customer/index.blade.php
index 5aca26b..6405ed9 100644
--- a/resources/views/admin/customer/index.blade.php
+++ b/resources/views/admin/customer/index.blade.php
@@ -11,16 +11,16 @@