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

Berater bestellungen kleine Änderungen

Browse source
This commit is contained in:
Kevin Adametz 2020-09-15 17:46:39 +02:00
parent c4ed6b39db
commit 74923859d1
8 changed files with 64 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

39
.idea/workspace.xml generated
View file

@ -5,42 +5,14 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment=""> <list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/user/order/_bak_shipping_me.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/user/order/_bak_shipping_ot.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/CustomerController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CustomerController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/SalesController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ShippingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ShippingController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/User/CustomerController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/User/CustomerController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/User/OrderController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/User/OrderController.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Http/Controllers/User/OrderController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/User/OrderController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/Models/Product.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Product.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/ShippingCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShippingCountry.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/ShippingPrice.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShippingPrice.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingOrderItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingOrderItem.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Services/HTMLHelper.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/HTMLHelper.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Services/Yard.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Yard.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2019_01_06_004849_create_shipping_prices_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_01_06_004849_create_shipping_prices_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/iq-shopping-cart.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/iq-shopping-cart.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/de/navigation.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/navigation.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/customer/_detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/customer/_detail.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/admin/customer/_detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/customer/_detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/customer/_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/customer/_edit.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/sales/_detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/_detail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/sales/users.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/users.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/customer/add.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/customer/add.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/customer/edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/customer/edit.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/order/comp_product.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/comp_product.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/order/delivery.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/delivery.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/user/order/delivery.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/delivery.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/order/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/order/list.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/list.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/user/order/list.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/list.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/order/shipping_me.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/shipping_me.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/order/shipping_ot.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/shipping_ot.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/user/order/yard_view_form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/yard_view_form.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -555,6 +527,11 @@
<workItem from="1598971116331" duration="4130000" /> <workItem from="1598971116331" duration="4130000" />
<workItem from="1599033832974" duration="4000" /> <workItem from="1599033832974" duration="4000" />
<workItem from="1599558681455" duration="23060000" /> <workItem from="1599558681455" duration="23060000" />
<workItem from="1599633110239" duration="250000" />
<workItem from="1600079440472" duration="408000" />
<workItem from="1600096831480" duration="2472000" />
<workItem from="1600175774205" duration="25000" />
<workItem from="1600179917484" duration="407000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -640,11 +617,11 @@
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>
<state x="951" y="549" key="com.jetbrains.php.test.PhpNewTestDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1591961096724" /> <state x="951" y="549" key="com.jetbrains.php.test.PhpNewTestDialog/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1591961096724" />
<state x="531" y="536" width="1497" height="794" key="find.popup" timestamp="1599579446337"> <state x="922" y="544" width="1497" height="794" key="find.popup" timestamp="1600097723761">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>
<state x="531" y="536" width="1497" height="794" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1598972717568" /> <state x="531" y="536" width="1497" height="794" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1598972717568" />
<state x="531" y="536" width="1497" height="794" key="find.popup/-2560.23.2560.1417/2560.-555.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1599579446337" /> <state x="922" y="544" width="1497" height="794" key="find.popup/-2560.23.2560.1417/2560.-555.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1600097723761" />
<state x="863" y="438" width="1115" height="793" key="find.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1598284238338" /> <state x="863" y="438" width="1115" height="793" key="find.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1598284238338" />
<state width="600" height="428" key="javadoc.popup" timestamp="1594733832314"> <state width="600" height="428" key="javadoc.popup" timestamp="1594733832314">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />

26
app/Http/Controllers/User/OrderController.php
View file

@ -24,6 +24,8 @@ class OrderController extends Controller
public function __construct() public function __construct()
{ {
$this->middleware('superadmin');
$this->middleware('active.account'); $this->middleware('active.account');
} }
@ -270,9 +272,29 @@ class OrderController extends Controller
public function datatable(){ public function datatable(){
$show_at = 1;
// $user = User::find(\Auth::user()->id); // $user = User::find(\Auth::user()->id);
$query = Product::select('products.*')->where('active', true) ;
->where('show_at', '=', 1); //Kunden und Berater
if(Request::get('shipping_is_for') === 'me'){
$query = Product::select('products.*')->where('active', true)->where(function ($q) {
$q->where('show_at', '=', 1)
->orWhere('show_at', '=', 2)
->orWhere('show_at', '=', 6);
});
}else{
$query = Product::select('products.*')->where('active', true)->where(function ($q) {
$q->where('show_at', '=', 0)
->orWhere('show_at', '=', 1);
});
}
//Kunden und Berater
//->orWhere('show_at', '=', 2); // Nur Berater //->orWhere('show_at', '=', 2); // Nur Berater
//->orderBy('pos', 'DESC') //->orderBy('pos', 'DESC')
//->orderBy('id', 'DESC'); //->orderBy('id', 'DESC');

1
app/Models/Product.php
View file

@ -188,6 +188,7 @@ class Product extends Model
3 => 'Registrierung / Mitgliedschaft Berater', 3 => 'Registrierung / Mitgliedschaft Berater',
4 => 'Nur Mitgliedschaft Berater', 4 => 'Nur Mitgliedschaft Berater',
5 => 'Onboarding Berater', 5 => 'Onboarding Berater',
6 => 'Onboarding Berater + Berater Shop',
]; ];

2
resources/views/admin/customer/_detail.blade.php
View file

@ -112,11 +112,13 @@
</div> </div>
@else @else
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
{{--
@if(!$shopping_user->is_like) @if(!$shopping_user->is_like)
<a href="{{ route('user_order_my_delivery', ['ot', $shopping_user->id]) }}" class="btn btn-sm btn-secondary mt-2"> <a href="{{ route('user_order_my_delivery', ['ot', $shopping_user->id]) }}" class="btn btn-sm btn-secondary mt-2">
<span class="fa fa-shopping-cart"></span> Bestellung für diesen Kunden aufgeben <span class="fa fa-shopping-cart"></span> Bestellung für diesen Kunden aufgeben
</a> </a>
@endif @endif
--}}
</div> </div>
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
<div class="text-muted small">Kundenhoheit</div> <div class="text-muted small">Kundenhoheit</div>

12
resources/views/admin/shipping/edit.blade.php
View file

@ -196,16 +196,10 @@
<div class="card mb-2"> <div class="card mb-2">
<h6 class="card-header"> <h6 class="card-header">
{{__('Länder')}} {{__('Land')}}
</h6> </h6>
<div class="card-datatable table-responsive"> <div class="card-datatable table-responsive">
<table class="datatables-style table table-striped table-bordered"> <table class="datatables-style table table-striped table-bordered">
<thead>
<tr>
<th>{{__('Land')}}</th>
<th></th>
</tr>
</thead>
<tbody> <tbody>
@foreach($value->countries as $country) @foreach($value->countries as $country)
<tr> <tr>
@ -224,12 +218,14 @@
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
@if(!$value->countries->count())
<div class="mt-4 ml-4"> <div class="mt-4 ml-4">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-country" <button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-country"
data-id="new" data-id="new"
>{{__('Land hinzufügen')}}</button> >{{__('Land hinzufügen')}}</button>
</div> </div>
@endif
</div> </div>
</div> </div>
@ -250,7 +246,7 @@
<div class="form-row"> <div class="form-row">
<div class="form-group col"> <div class="form-group col">
<label for="country_ids" class="form-label">{{__('Versandkosten gelten für diese Länder')}}</label> <label for="country_ids" class="form-label">{{__('Versandkosten gelten für diese Länder')}}</label>
<select class="selectpicker" data-style="btn-default" name="country_ids[]" multiple> <select class="selectpicker" data-style="btn-default" name="country_ids[]">
{!! HTMLHelper::getCountriesWithoutUsedShippings() !!} {!! HTMLHelper::getCountriesWithoutUsedShippings() !!}
</select> </select>
</div> </div>

23
resources/views/user/order/delivery.blade.php
View file

@ -58,7 +58,7 @@
@endif @endif
<div class="show-is-for-customer"> <div class="show-is-for-customer">
<h4>An diesen Kunde versenden</h4> <h4>An diesen Kunde versenden</h4>
<p>Sollten unten stehend Angaben nicht korrekt sein oder aktualisiert werden müssen, ändere diese bitte vorerst unter: <p>Sollten unten stehende Angaben nicht korrekt sein oder aktualisiert werden müssen, ändere diese bitte vorerst unter:
<a href="{{route('user_customers')}}">Meine Kunden -> Übersicht</a> -> <a href="{{route('user_customer_detail', $shopping_user->id)}}"><i class="fa fa-edit"></i> Kunde</a></a></p> <a href="{{route('user_customers')}}">Meine Kunden -> Übersicht</a> -> <a href="{{route('user_customer_detail', $shopping_user->id)}}"><i class="fa fa-edit"></i> Kunde</a></a></p>
@include('admin.customer._customer_detail') @include('admin.customer._customer_detail')
</div> </div>
@ -66,11 +66,21 @@
</div> </div>
@if($shopping_user) @if($shopping_user)
<div class="float-right"> <div class="" id="hide_for_me">
<hr>
<div class="form-group">
<label class="custom-control custom-checkbox m-2 ">
<input type="checkbox" class="custom-control-input" name="check_for_ot" id="checkbox_for_me" required>
<span class="custom-control-label secondary">{{__('Mir ist bekannt, dass dieser Bestellvorgang nur für Kundenbestellungen ist und nicht für meine eigenen Bestellungen')}}</span>
</label>
</div>
</div>
<div class="float-rights">
<button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button> <button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button>
</div> </div>
@else @else
<div class="float-right" id="hide_for_ot"> <div class="float-rights" id="hide_for_ot">
<button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button> <button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button>
</div> </div>
@endif @endif
@ -86,9 +96,16 @@
if($(this).val() === 'ot'){ if($(this).val() === 'ot'){
$('#show-is-for-customer').show('slow'); $('#show-is-for-customer').show('slow');
$('#hide_for_ot').hide('slow'); $('#hide_for_ot').hide('slow');
$('#hide_for_me').show('slow');
$('#checkbox_for_me').attr('required', true);
}else{ }else{
$('#show-is-for-customer').hide('slow'); $('#show-is-for-customer').hide('slow');
$('#hide_for_ot').show('slow'); $('#hide_for_ot').show('slow');
$('#hide_for_me').hide('slow');
$('#checkbox_for_me').attr('required', false);
} }
}); });
}); });

8
resources/views/user/order/list.blade.php
View file

@ -49,8 +49,7 @@
</style> </style>
@if($user->user_level) @if($user->user_level)
<p>Die Produktpreise werden entsprechend deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt.<br> <p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt. Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
@else @else
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p> <p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
@endif @endif
@ -141,7 +140,7 @@
ajax: { ajax: {
url: '{!! route( 'user_order_my_datatable') !!}', url: '{!! route( 'user_order_my_datatable') !!}',
data: function(d) { data: function(d) {
// d.filter_member_id = $('select[name=filter_member_id]').val(); d.shipping_is_for = $('input[name=shipping_is_for]').val();
// d.filter_customer_member = $('select[name=filter_customer_member]').val(); // d.filter_customer_member = $('select[name=filter_customer_member]').val();
} }
}, },
@ -158,7 +157,8 @@
{ data: 'action', name: 'action', searchable: false, orderable: false }, { data: 'action', name: 'action', searchable: false, orderable: false },
], ],
"bLengthChange": false, "bLengthChange": false,
"iDisplayLength": 50, "iDisplayLength": 1000,
"paging": false,
"language": { "language": {
"url": "/js/German.json" "url": "/js/German.json"
}, },

2
resources/views/web/templates/checkout-final.blade.php
View file

@ -93,7 +93,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<h3>Vielen Dank, </h3> <h3>Vielen Dank, </h3>
<p>Deine Bestellung ist bei uns eingegangen. In Kürze erhälst du von uns eine Bestellbestätigungsmail.</p> <p>Deine Bestellung ist bei uns eingegangen. In Kürze erhälst Du von uns eine Bestellbestätigungsmail.</p>
<h4>Deine Bestellnummer ist: {{ $order_reference }}</h4> <h4>Deine Bestellnummer ist: {{ $order_reference }}</h4>
<hr /> <hr />