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

#53, #52, #51 change Points

Browse source
This commit is contained in:
Kevin Adametz 2022-07-21 10:37:34 +02:00
parent 582ca8299d
commit 263cf93a1e
41 changed files with 812 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/User/HomepartyController.php
View file

@ -564,7 +564,7 @@ class HomepartyController extends Controller
public function datatable($homeparty_id){
$query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '3');
$query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '4');
$homeparty = Homeparty::findOrFail($homeparty_id);
return \DataTables::eloquent($query)

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

@ -43,6 +43,10 @@ class OrderController extends Controller
if($shopping_order->auth_user_id !== $user->id){
abort(404);
}
if( $shopping_order->payment_for === 6 || $shopping_order->payment_for === 7){
return redirect(route('user_shop_order_detail', [$shopping_order->id]));
abort(403, 'Kundenbestellung');
}
$shopping_order->getLastShoppingPayment();
$data = [
@ -59,7 +63,7 @@ class OrderController extends Controller
return \DataTables::eloquent($query)
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
return '<a href="' . route('user_order_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
return '<a href="'.route('user_order_detail', [$ShoppingOrder->id]).'" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
})
->addColumn('created_at', function (ShoppingOrder $ShoppingOrder) {
return $ShoppingOrder->created_at->format("d.m.Y");
@ -74,6 +78,15 @@ class OrderController extends Controller
return $ShoppingOrder->getLastShoppingPayment('getPaymentType');
})
->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) {
if($ShoppingOrder->payment_for === 8){
return '<button type="button" class="btn btn-xs btn-info btn-round" data-toggle="modal" data-target="#modals-load-content"
data-id="'.$ShoppingOrder->id.'"
data-action="shop-user-order-shipping-detail"
data-back=""
data-modal="modal-xl"
data-init_from="user"
data-route="'.route('modal_load').'"><span class="far fa-eye"></span></button>';
}
return '<span class="badge badge-pill badge-'.$ShoppingOrder->getShippedColor().'">'.$ShoppingOrder->getShippedType().'</span>';
})
->addColumn('payment_for', function (ShoppingOrder $ShoppingOrder) {
@ -277,7 +290,7 @@ class OrderController extends Controller
if(Request::get('shipping_is_for') === 'me'){
$query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '2');
}else{
$query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '1');
$query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '3');
}
return \DataTables::eloquent($query)
@ -465,7 +478,7 @@ class OrderController extends Controller
private function getCompProducts($for){
if($for === 'me'){
return Product::whereActive(true)->whereJsonContains('show_on', ['1', '2', '3'])->where('shipping_addon', true)->orderBy('pos', 'DESC')->get();
return Product::whereActive(true)->whereJsonContains('show_on', ['1', '2', '3', '4'])->where('shipping_addon', true)->orderBy('pos', 'DESC')->get();
}
return null;
}

5
app/Http/Controllers/User/ShopApiController.php
View file

@ -15,8 +15,8 @@ use App\Repositories\ShopApiRepository;
class ShopApiController extends Controller
{
private $api_action = [0 => 'bitte wählen', 'order' => 'markierte bestellen', 'remove' => 'markierte entfernen', 'reset' => 'markierte zurücksetzen/offen'];
private $filter_show = [10 => 'alle anzeigen', 1 => 'offen', 2 => 'bestellt', 5 => 'entfernt'];
private $api_action = [0 => 'bitte wählen', 'order' => 'markierte bezahlen', 'remove' => 'markierte entfernen', 'reset' => 'markierte zurücksetzen/bestellt'];
private $filter_show = [10 => 'alle anzeigen', 1 => 'bestellt', 2 => 'bezahlt', 5 => 'entfernt'];
protected $shopApiRepository;
public function __construct(ShopApiRepository $shopApiRepository)
@ -28,7 +28,6 @@ class ShopApiController extends Controller
public function orders()
{
$this->setFilterVars();
$data = [
'api_action' => $this->api_action,
'filter_show' => $this->filter_show,

4
app/Http/Controllers/User/ShopSalesController.php
View file

@ -30,6 +30,10 @@ class ShopSalesController extends Controller
if($shopping_order->member_id !== $user->id){
abort(404);
}
if( $shopping_order->payment_for !== 6 && $shopping_order->payment_for !== 7){
return redirect(route('user_order_detail', [$shopping_order->id]));
abort(403, 'Beraterbestellung');
}
$data = [
'shopping_order' => $shopping_order,
'isAdmin' => false,