Berater Bestellung / online
This commit is contained in:
Kevin Adametz
parent
16fe2fa363
commit
ecc71c616f
26 changed files with 828 additions and 240 deletions
58
.idea/workspace.xml
generated
58
.idea/workspace.xml
generated
|
|
@ -5,26 +5,30 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" 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/Api/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/PayoneController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/LeadController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/LeadController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/MembershipController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/MembershipController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.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/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/Web/CheckoutController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/WizardController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Middleware/Checkout.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Middleware/Checkout.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/PaymentMethod.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/PaymentMethod.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingPayment.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingPayment.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShoppingOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingOrder.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/Models/ShoppingUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingUser.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Payment.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Payment.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Shop.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Shop.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.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_02_23_161530_create_shopping_users_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_23_161530_create_shopping_users_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_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$/resources/lang/de/email.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de/email.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/customers.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/sales/customers.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/emails/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout_status.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/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/shop/sales/order_detail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/order/detail.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" />
|
||||
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
|
||||
</list>
|
||||
|
|
@ -272,13 +276,6 @@
|
|||
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/order" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/customer" />
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs/dropzone" />
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/admin/user" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/order" />
|
||||
<recent name="$PROJECT_DIR$/public/js" />
|
||||
|
|
@ -286,6 +283,13 @@
|
|||
<recent name="$PROJECT_DIR$/resources/views/admin/modal" />
|
||||
<recent name="$PROJECT_DIR$/app/Http/Controllers/SyS" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/order" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/user/customer" />
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs/dropzone" />
|
||||
<recent name="$PROJECT_DIR$/public/vendor/libs" />
|
||||
<recent name="$PROJECT_DIR$/resources/views/admin/user" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager" selected="Shell Script.composer-post-update.sh">
|
||||
<configuration name="de" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" temporary="true">
|
||||
|
|
@ -534,6 +538,8 @@
|
|||
<workItem from="1597658985953" duration="2000" />
|
||||
<workItem from="1597928402978" duration="7140000" />
|
||||
<workItem from="1598016608485" duration="9648000" />
|
||||
<workItem from="1598255562481" duration="22043000" />
|
||||
<workItem from="1598282618629" duration="1154000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -614,29 +620,30 @@
|
|||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="758" y="370" key="SettingsEditor/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1596269067229" />
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1597415323689">
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1598257732352">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1597415323689" />
|
||||
<state x="1064" y="650" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1598257732352" />
|
||||
<state x="951" y="549" key="com.jetbrains.php.test.PhpNewTestDialog" timestamp="1591961096724">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</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="531" y="536" width="1497" height="794" key="find.popup" timestamp="1598024943525">
|
||||
<state x="863" y="438" width="1115" height="793" key="find.popup" timestamp="1598284238338">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="-1755" y="444" width="1115" height="793" key="find.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@-2560.23.2560.1417" timestamp="1589974580416" />
|
||||
<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="1598024943525" />
|
||||
<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="1597301750195" />
|
||||
<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">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state width="600" height="428" key="javadoc.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1594733832314" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1596888361783">
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1598268751822">
|
||||
<screen x="0" y="23" width="2560" height="1417" />
|
||||
</state>
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-527.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1596888361783" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1595679115918" />
|
||||
<state x="945" y="377" width="670" height="676" key="search.everywhere.popup/2560.-527.1440.2537/-2560.23.2560.1417/0.23.2560.1417@0.23.2560.1417" timestamp="1598268751822" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
@ -646,11 +653,6 @@
|
|||
<line>15</line>
|
||||
<option name="timeStamp" value="1" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="php">
|
||||
<url>file://$PROJECT_DIR$/resources/views/emails/checkout.blade.php</url>
|
||||
<line>362</line>
|
||||
<option name="timeStamp" value="4" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\PaymentTransaction;
|
||||
use App\Models\ShoppingOrder;
|
||||
use App\Models\ShoppingPayment;
|
||||
use App\Models\ShoppingUser;
|
||||
use App\Models\UserShop;
|
||||
use App\Services\CustomerPriority;
|
||||
|
|
@ -47,10 +49,9 @@ class SalesController extends Controller
|
|||
return view('admin.sales.user_detail', $data);
|
||||
}
|
||||
|
||||
|
||||
public function usersDatatable(){
|
||||
|
||||
$query = ShoppingOrder::with('shopping_user', 'user_shop')->select('shopping_orders.*')->where('shopping_orders.auth_user_id', '!=', NULL);
|
||||
$query = ShoppingOrder::with('shopping_user', 'user_shop', 'shopping_payments')->select('shopping_orders.*')->where('shopping_orders.auth_user_id', '!=', NULL);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
|
||||
|
|
@ -63,7 +64,25 @@ class SalesController extends Controller
|
|||
return Payment::getShoppingOrderBadge($ShoppingOrder);
|
||||
})
|
||||
->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getFormattedTotalShipping();
|
||||
return $ShoppingOrder->getFormattedTotalShipping()." €";
|
||||
})
|
||||
->addColumn('payment', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getLastShoppingPayment('getPaymentType');
|
||||
})
|
||||
->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) {
|
||||
return '<span class="badge badge-pill badge-'.$ShoppingOrder->getShippedColor().'">'.$ShoppingOrder->getShippedType().'</span>';
|
||||
})
|
||||
->addColumn('is_for', function (ShoppingOrder $ShoppingOrder) {
|
||||
if($ShoppingOrder->shopping_user->is_for === 'me'){
|
||||
return '<span class="badge badge-pill badge-secondary">Berater</span>';
|
||||
}
|
||||
if($ShoppingOrder->shopping_user->is_for === 'ot'){
|
||||
return '<span class="badge badge-pill badge-info">Kunde</span>';
|
||||
}
|
||||
return '-';
|
||||
})
|
||||
->addColumn('reference', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getLastShoppingPayment('reference');
|
||||
})
|
||||
->addColumn('orders', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->orders : '';
|
||||
|
|
@ -78,8 +97,10 @@ class SalesController extends Controller
|
|||
->orderColumn('id', 'id $1')
|
||||
->orderColumn('txaction', 'txaction $1')
|
||||
->orderColumn('user_shop_id', 'user_shop_id $1')
|
||||
->orderColumn('shipped', 'shipped $1')
|
||||
->orderColumn('total_shipping', 'total_shipping $1')
|
||||
|
||||
->rawColumns(['id', 'txaction', 'user_shop_id', 'auth_user_shop'])
|
||||
->rawColumns(['id', 'txaction', 'user_shop_id', 'auth_user_shop', 'is_for', 'shipped'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
|
|
@ -185,9 +206,26 @@ class SalesController extends Controller
|
|||
return Payment::getShoppingOrderBadge($ShoppingOrder);
|
||||
})
|
||||
->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getFormattedTotalShipping();
|
||||
return $ShoppingOrder->getFormattedTotalShipping()." €";
|
||||
})
|
||||
->addColumn('payment', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getLastShoppingPayment('getPaymentType');
|
||||
})
|
||||
->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) {
|
||||
return '<span class="badge badge-pill badge-'.$ShoppingOrder->getShippedColor().'">'.$ShoppingOrder->getShippedType().'</span>';
|
||||
})
|
||||
->addColumn('is_for', function (ShoppingOrder $ShoppingOrder) {
|
||||
if($ShoppingOrder->shopping_user->is_for === 'me'){
|
||||
return '<span class="badge badge-pill badge-secondary">Berater</span>';
|
||||
}
|
||||
if($ShoppingOrder->shopping_user->is_for === 'ot'){
|
||||
return '<span class="badge badge-pill badge-info">Kunde</span>';
|
||||
}
|
||||
return '-';
|
||||
})
|
||||
->addColumn('reference', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getLastShoppingPayment('reference');
|
||||
})
|
||||
|
||||
->addColumn('member_id', function (ShoppingOrder $ShoppingOrder) {
|
||||
if($ShoppingOrder->member_id) {
|
||||
return $ShoppingOrder->member_id ? '<a href="' . route('admin_lead_edit', [$ShoppingOrder->member_id]) . '">' . $ShoppingOrder->member->getFullName() . '</a>' : '';
|
||||
|
|
@ -211,8 +249,53 @@ class SalesController extends Controller
|
|||
->orderColumn('txaction', 'txaction $1')
|
||||
->orderColumn('user_shop_id', 'user_shop_id $1')
|
||||
->orderColumn('member_id', 'member_id $1')
|
||||
->rawColumns(['id', 'member_id', 'txaction', 'user_shop_id'])
|
||||
->orderColumn('shipped', 'shipped $1')
|
||||
->orderColumn('total_shipping', 'total_shipping $1')
|
||||
->rawColumns(['id', 'member_id', 'txaction', 'user_shop_id', 'is_for', 'shipped'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
public function store(){
|
||||
$data = Request::all();
|
||||
if(!isset($data['id'])){
|
||||
abort(404);
|
||||
}
|
||||
if(isset($data['action'])){
|
||||
if($data['action'] === 'store_shipped' && isset($data['shipped'])){
|
||||
$shopping_order = ShoppingOrder::findOrFail($data['id']);
|
||||
$shopping_order->shipped = $data['shipped'];
|
||||
$shopping_order->save();
|
||||
}
|
||||
|
||||
if($data['action'] === 'store_txaction' && isset($data['txaction']) && isset($data['payment_id'])){
|
||||
$shopping_order = ShoppingOrder::findOrFail($data['id']);
|
||||
$shopping_payment = ShoppingPayment::findOrFail($data['payment_id']);
|
||||
|
||||
PaymentTransaction::create([
|
||||
'shopping_payment_id' => $shopping_payment->id,
|
||||
'request' => 'transaction',
|
||||
'txid' => 0,
|
||||
'userid' => 0,
|
||||
'status' => 'FNCMIV',
|
||||
'transmitted_data' => NULL,
|
||||
'txaction' => $data['txaction'],
|
||||
'mode' => $shopping_payment->mode,
|
||||
]);
|
||||
|
||||
$shopping_order->txaction = $data['txaction'];
|
||||
$shopping_order->paid = true;
|
||||
$shopping_order->save();
|
||||
$shopping_payment->txaction = $data['txaction'];
|
||||
$shopping_payment->save();
|
||||
|
||||
//TODO can send MAIL
|
||||
//Payment::paymentStatusSendMail($shopping_order, $shopping_payment, $data);
|
||||
}
|
||||
|
||||
}
|
||||
if(isset($data['back'])){
|
||||
return redirect($data['back']);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -91,7 +91,7 @@ class CustomerController extends Controller
|
|||
$step = 1;
|
||||
$shopping_user->same_as_billing = true;
|
||||
$shopping_user->faker_mail = true;
|
||||
$billing_email = time()."@faker-mivita.care";
|
||||
$billing_email = time()."-faker@mivita.care";
|
||||
}
|
||||
}
|
||||
$data = [
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ class OrderController extends Controller
|
|||
|
||||
public function index()
|
||||
{
|
||||
|
||||
$data = [
|
||||
];
|
||||
return view('user.order.index', $data);
|
||||
|
|
@ -41,6 +42,8 @@ class OrderController extends Controller
|
|||
if($shopping_order->auth_user_id !== $user->id){
|
||||
abort(404);
|
||||
}
|
||||
$shopping_order->getLastShoppingPayment();
|
||||
|
||||
$data = [
|
||||
'shopping_order' => $shopping_order,
|
||||
'isAdmin' => false,
|
||||
|
|
@ -51,7 +54,7 @@ class OrderController extends Controller
|
|||
public function ordersDatatable(){
|
||||
|
||||
$user = User::find(\Auth::user()->id);
|
||||
$query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('auth_user_id', '=', $user->id)->where('txaction', '!=', NULL);
|
||||
$query = ShoppingOrder::with('shopping_user', 'shopping_payments')->select('shopping_orders.*')->where('auth_user_id', '=', $user->id)->where('txaction', '!=', NULL);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
|
||||
|
|
@ -64,19 +67,32 @@ class OrderController extends Controller
|
|||
return Payment::getShoppingOrderBadge($ShoppingOrder);
|
||||
})
|
||||
->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getFormattedTotalShipping();
|
||||
return $ShoppingOrder->getFormattedTotalShipping()." €";
|
||||
})
|
||||
->addColumn('orders', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->orders : '';
|
||||
->addColumn('payment', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getLastShoppingPayment('getPaymentType');
|
||||
})
|
||||
->addColumn('user_shop_id', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain(false).'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain(false).'</span>' : '';
|
||||
->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) {
|
||||
return '<span class="badge badge-pill badge-'.$ShoppingOrder->getShippedColor().'">'.$ShoppingOrder->getShippedType().'</span>';
|
||||
})
|
||||
->addColumn('is_for', function (ShoppingOrder $ShoppingOrder) {
|
||||
if($ShoppingOrder->shopping_user->is_for === 'me'){
|
||||
return '<span class="badge badge-pill badge-secondary">Berater</span>';
|
||||
}
|
||||
if($ShoppingOrder->shopping_user->is_for === 'ot'){
|
||||
return '<span class="badge badge-pill badge-info">Kunde</span>';
|
||||
}
|
||||
return '-';
|
||||
})
|
||||
->addColumn('reference', function (ShoppingOrder $ShoppingOrder) {
|
||||
return $ShoppingOrder->getLastShoppingPayment('reference');
|
||||
})
|
||||
|
||||
->orderColumn('id', 'id $1')
|
||||
->orderColumn('txaction', 'txaction $1')
|
||||
->orderColumn('user_shop_id', 'user_shop_id $1')
|
||||
|
||||
->rawColumns(['id', 'txaction', 'user_shop_id'])
|
||||
->orderColumn('shipped', 'shipped $1')
|
||||
->orderColumn('total_shipping', 'total_shipping $1')
|
||||
->rawColumns(['id', 'txaction', 'is_for', 'shipped'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,8 @@ class CheckoutController extends Controller
|
|||
|
||||
public function checkout(){
|
||||
|
||||
//TODO ZAHLDIENSTE FORM USER !!!
|
||||
|
||||
// dump(Request::all());
|
||||
// dd("back");
|
||||
// $user_shop = Util::getUserShop();
|
||||
$shopping_data = Yard::instance('shopping')->getYardExtra('shopping_data');
|
||||
|
||||
|
|
@ -87,8 +85,6 @@ class CheckoutController extends Controller
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
if(old('selected_country') && old('selected_country') === 'change'){
|
||||
\Session::forget('_old_input.selected_country');
|
||||
$shopping_user->billing_state = old('billing_state');
|
||||
|
|
@ -110,8 +106,10 @@ class CheckoutController extends Controller
|
|||
if($is_from !== 'shopping' && Util::getAuthUser()){
|
||||
$user = Util::getAuthUser();
|
||||
$payment_methods = $user->payment_methods;
|
||||
$payment_data = $user->account->payment_data;
|
||||
}else{
|
||||
$payment_methods = PaymentMethod::getDefaultAsArray();
|
||||
$payment_methods = PaymentMethod::getDefaultAsArray()->toArray();
|
||||
$payment_data = false;
|
||||
}
|
||||
|
||||
$payment_methods_active = \App\Models\PaymentMethod::where('active', true)->get()->pluck( 'id', 'short')->toArray();
|
||||
|
|
@ -124,6 +122,7 @@ class CheckoutController extends Controller
|
|||
'shopping_mode' => Util::getUserShoppingMode(),
|
||||
'payment_methods' => $payment_methods,
|
||||
'payment_methods_active' => $payment_methods_active,
|
||||
'payment_data' => $payment_data,
|
||||
];
|
||||
return view('web.templates.checkout', $data);
|
||||
}
|
||||
|
|
@ -147,6 +146,8 @@ class CheckoutController extends Controller
|
|||
$shopping_user->billing_phone = $user->account->phone;
|
||||
$shopping_user->billing_email = $user->email;
|
||||
$shopping_user->faker_mail = false;
|
||||
$shopping_user->shipping_email = $user->email;
|
||||
|
||||
$shopping_user->accepted_data_checkbox = 1;
|
||||
$shopping_user->is_for = $is_for;
|
||||
$shopping_user->is_from = $is_from;
|
||||
|
|
@ -154,7 +155,7 @@ class CheckoutController extends Controller
|
|||
if($is_from === 'user_order'){
|
||||
if(isset($data['shopping_user_id']) && $data['is_for'] === 'ot'){
|
||||
$s_user = ShoppingUser::findOrFail($data['shopping_user_id']);
|
||||
$shopping_user->billing_salutation = $s_user->billing_salutation;
|
||||
/* $shopping_user->billing_salutation = $s_user->billing_salutation;
|
||||
$shopping_user->billing_company = $s_user->billing_company;
|
||||
$shopping_user->billing_firstname = $s_user->billing_firstname;
|
||||
$shopping_user->billing_lastname = $s_user->billing_lastname;
|
||||
|
|
@ -165,11 +166,14 @@ class CheckoutController extends Controller
|
|||
$shopping_user->billing_country_id = $s_user->billing_country_id;
|
||||
$shopping_user->billing_phone = $s_user->billing_phone;
|
||||
$shopping_user->billing_email = $s_user->billing_email;
|
||||
;*/
|
||||
$shopping_user->faker_mail = $s_user->faker_mail;
|
||||
if(!$s_user->faker_mail){
|
||||
$shopping_user->shipping_email = $s_user->billing_email;
|
||||
}
|
||||
$shopping_user->shopping_user_id = $data['shopping_user_id'];
|
||||
$shopping_user->member_id = $s_user->member_id;
|
||||
}
|
||||
|
||||
$shopping_user->same_as_billing = false;
|
||||
$shopping_user->shipping_salutation = isset($data['shipping_salutation']) ? $data['shipping_salutation'] : '';
|
||||
$shopping_user->shipping_company = isset($data['shipping_company']) ? $data['shipping_company'] : '';
|
||||
|
|
@ -179,7 +183,7 @@ class CheckoutController extends Controller
|
|||
$shopping_user->shipping_address_2 = isset($data['shipping_address_2']) ? $data['shipping_address_2'] : '';
|
||||
$shopping_user->shipping_zipcode = isset($data['shipping_zipcode']) ? $data['shipping_zipcode'] : '';
|
||||
$shopping_user->shipping_city = isset($data['shipping_city']) ? $data['shipping_city'] : '';
|
||||
$shopping_user->shipping_country_id = isset($data['shipping_state']) ? $data['shipping_state'] : '';
|
||||
$shopping_user->shipping_country_id = Yard::instance('shopping')->getShippingCountryCountryId();
|
||||
$shopping_user->shipping_phone = isset($data['shipping_phone']) ? $data['shipping_phone'] : '';
|
||||
|
||||
}else{
|
||||
|
|
@ -211,7 +215,6 @@ class CheckoutController extends Controller
|
|||
Yard::instance('shopping')->setShippingCountryWithPrice($data['shipping_state'], $data['is_for']);
|
||||
}
|
||||
return back()->withInput(Request::all());
|
||||
|
||||
}
|
||||
|
||||
$rules = array(
|
||||
|
|
@ -244,6 +247,7 @@ class CheckoutController extends Controller
|
|||
$data = Request::all();
|
||||
//make User
|
||||
$shopping_user = $this->makeShoppingUser($data);
|
||||
|
||||
//make Order and Items
|
||||
$shopping_order = $this->makeShoppingOrder($shopping_user);
|
||||
//CustomerPriority
|
||||
|
|
@ -294,7 +298,6 @@ class CheckoutController extends Controller
|
|||
$pay->init($shopping_user, $shopping_order);
|
||||
$amount = Yard::instance('shopping')->totalWithShipping(2, '.', '') * 100;
|
||||
$ret['elv'] = $pay->checkBankAccount($data, $amount, 'EUR', $shopping_user);
|
||||
|
||||
if($ret['elv']['status'] === 'ERROR' || $ret['elv']['status'] === 'INVALID'){
|
||||
/* PaymentTransaction::create([
|
||||
'shopping_payment_id' => //is no shopping_payment_id at this moment,
|
||||
|
|
@ -418,7 +421,7 @@ class CheckoutController extends Controller
|
|||
private function storeUserPaymentsData($shopping_user, $ret){
|
||||
if($shopping_user->auth_user_id){
|
||||
$user = User::find($shopping_user->auth_user_id);
|
||||
if($user && $user->account && $shopping_user->abo_options){
|
||||
if($user && $user->account){
|
||||
if(isset($ret['elv']) && is_array($ret['elv'])){
|
||||
$user->account->payment_data = $ret['elv'];
|
||||
$user->account->save();
|
||||
|
|
@ -459,12 +462,20 @@ class CheckoutController extends Controller
|
|||
'country_id' => Yard::instance('shopping')->getShippingCountryId(),
|
||||
'user_shop_id' => $user_shop->id,
|
||||
'payment_for' => Util::getUserPaymentFor(),
|
||||
|
||||
|
||||
'total' => Yard::instance('shopping')->total(2, '.', ''),
|
||||
'subtotal' => Yard::instance('shopping')->subtotal(2, '.', ''),
|
||||
|
||||
'shipping' => Yard::instance('shopping')->shipping(2, '.', ','),
|
||||
'subtotal' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''),
|
||||
//'tax_rate' => Yard::getTaxRate(),
|
||||
'shipping_net' => Yard::instance('shopping')->shippingNet(2, '.', ''),
|
||||
'subtotal_ws' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''),
|
||||
|
||||
'tax' => Yard::instance('shopping')->taxWithShipping(2, '.', ''),
|
||||
'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ''),
|
||||
|
||||
'points' => Yard::instance('shopping')->points(),
|
||||
|
||||
'weight' => Yard::instance('shopping')->weight(),
|
||||
'txaction' => 'prev',
|
||||
'mode' => Util::getUserShoppingMode(),
|
||||
|
|
@ -494,6 +505,7 @@ class CheckoutController extends Controller
|
|||
'product_id' => $item->id,
|
||||
'qty' => $item->qty,
|
||||
'price' => $item->price,
|
||||
'price_net' => Yard::instance('shopping')->rowPriceNet($item, 3, '.', ''),
|
||||
'tax_rate' => $item->taxRate,
|
||||
'slug' => $item->options->slug,
|
||||
])->save();
|
||||
|
|
@ -511,6 +523,7 @@ class CheckoutController extends Controller
|
|||
'product_id' => $item->id,
|
||||
'qty' => $item->qty,
|
||||
'price' => $item->price,
|
||||
'price_net' => Yard::instance('shopping')->rowPriceNet($item, 3, '.', ''),
|
||||
'tax_rate' => $item->taxRate,
|
||||
'slug' => $item->options->slug
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -38,19 +38,18 @@ class Checkout
|
|||
}
|
||||
if($shopping_instance->back){
|
||||
\Session::put('back_link', $shopping_instance->back);
|
||||
|
||||
}
|
||||
\Session::put('new_session', true);
|
||||
|
||||
Yard::instance('shopping')->destroy();
|
||||
//restore yard
|
||||
Yard::instance('shopping')->restore($request->route('identifier'));
|
||||
|
||||
Yard::instance('shopping')->putYardExtra('user_shop_payment', $shopping_instance->payment);
|
||||
|
||||
Yard::instance('shopping')->putYardExtra('shopping_data', $shopping_instance->shopping_data);
|
||||
$is_for = isset($shopping_instance->shopping_data['is_for']) ? $shopping_instance->shopping_data['is_for'] : 'ot';
|
||||
Yard::instance('shopping')->setShippingCountryWithPrice($shopping_instance->country_id, $is_for);
|
||||
|
||||
|
||||
ShoppingInstance::where('identifier', $request->route('identifier'))->delete();
|
||||
$request->route()->forgetParameter('identifier');
|
||||
|
||||
|
|
|
|||
|
|
@ -83,18 +83,38 @@ class ShoppingOrder extends Model
|
|||
'country_id',
|
||||
'user_shop_id',
|
||||
'total',
|
||||
'shipping',
|
||||
'subtotal',
|
||||
//'tax_rate',
|
||||
'shipping',
|
||||
'shipping_net',
|
||||
'subtotal_ws',
|
||||
'tax',
|
||||
'total_shipping',
|
||||
'points',
|
||||
'weight',
|
||||
'paid',
|
||||
'txaction',
|
||||
'wp_invoice_path',
|
||||
'mode',
|
||||
'shipped',
|
||||
'tracking'
|
||||
];
|
||||
|
||||
public static $shippedTypes = [
|
||||
0 => 'offen',
|
||||
1 => 'versendet',
|
||||
2 => 'abgeschlossen',
|
||||
4 => 'In Bearbeitung',
|
||||
|
||||
50 => 'storiniert'
|
||||
];
|
||||
|
||||
public static $shippedColors = [
|
||||
0 => 'warning',
|
||||
1 => 'success',
|
||||
2 => 'success',
|
||||
4 => 'info',
|
||||
50 => 'danger',
|
||||
];
|
||||
|
||||
public function shopping_user()
|
||||
{
|
||||
|
|
@ -150,36 +170,63 @@ class ShoppingOrder extends Model
|
|||
}
|
||||
}
|
||||
|
||||
public function _format_number($value)
|
||||
{
|
||||
return preg_replace("/[^0-9,]/", "", $value);
|
||||
public function getLastShoppingPayment($key=false){
|
||||
$shopping_payment = $this->shopping_payments->last();
|
||||
if($shopping_payment){
|
||||
if($key === 'getPaymentType'){
|
||||
return $shopping_payment->getPaymentType();
|
||||
}
|
||||
if($key === 'reference'){
|
||||
return $shopping_payment->reference;
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public function getShippedType(){
|
||||
return isset(self::$shippedTypes[$this->shipped]) ? self::$shippedTypes[$this->shipped] : "";
|
||||
}
|
||||
|
||||
public function getShippedColor(){
|
||||
return isset(self::$shippedColors[$this->shipped]) ? self::$shippedColors[$this->shipped] : "default";
|
||||
}
|
||||
|
||||
public function getFormattedTotal()
|
||||
{
|
||||
return formatNumber($this->attributes['total']);
|
||||
}
|
||||
|
||||
public function getFormattedSubtotal()
|
||||
{
|
||||
return formatNumber($this->attributes['subtotal']);
|
||||
}
|
||||
|
||||
public function getFormattedShipping()
|
||||
{
|
||||
if (\App::getLocale() === "en") {
|
||||
return number_format($this->attributes['shipping'], 2, '.', ',');
|
||||
return formatNumber($this->attributes['shipping']);
|
||||
}
|
||||
return number_format($this->attributes['shipping'], 2, ',', '.');
|
||||
|
||||
public function getFormattedShippingNet()
|
||||
{
|
||||
return formatNumber($this->attributes['shipping_net']);
|
||||
}
|
||||
|
||||
public function getFormattedSubtotalWs()
|
||||
{
|
||||
return formatNumber($this->attributes['subtotal_ws']);
|
||||
}
|
||||
|
||||
public function getFormattedTax()
|
||||
{
|
||||
return formatNumber($this->attributes['tax']);
|
||||
}
|
||||
|
||||
public function getFormattedTotalShipping()
|
||||
{
|
||||
if (\App::getLocale() === "en") {
|
||||
return number_format($this->attributes['total_shipping'], 2, '.', ',');
|
||||
}
|
||||
return number_format($this->attributes['total_shipping'], 2, ',', '.');
|
||||
return formatNumber($this->attributes['total_shipping']);
|
||||
}
|
||||
|
||||
|
||||
public function getFormattedPrice()
|
||||
{
|
||||
if (\App::getLocale() === "en") {
|
||||
return number_format($this->attributes['price'], 2, '.', ',');
|
||||
}
|
||||
return number_format($this->attributes['price'], 2, ',', '.');
|
||||
}
|
||||
|
||||
|
||||
public function getItemsCount(){
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ class ShoppingOrderItem extends Model
|
|||
'product_id',
|
||||
'qty',
|
||||
'price',
|
||||
'price_net',
|
||||
'tax_rate',
|
||||
'slug',
|
||||
];
|
||||
|
|
@ -72,10 +73,22 @@ class ShoppingOrderItem extends Model
|
|||
|
||||
public function getFormattedPrice()
|
||||
{
|
||||
if (\App::getLocale() == "en") {
|
||||
return number_format($this->attributes['price'], 2, '.', ',');
|
||||
return formatNumber($this->attributes['price']);
|
||||
}
|
||||
return number_format($this->attributes['price'], 2, ',', '.');
|
||||
|
||||
public function getFormattedTotalPrice()
|
||||
{
|
||||
return formatNumber($this->attributes['price'] * $this->attributes['qty']);
|
||||
}
|
||||
|
||||
public function getFormattedPriceNet()
|
||||
{
|
||||
return formatNumber($this->attributes['price_net']);
|
||||
}
|
||||
|
||||
public function getFormattedTotalPriceNet()
|
||||
{
|
||||
return formatNumber($this->attributes['price_net'] * $this->attributes['qty']);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -130,6 +130,7 @@ class ShoppingUser extends Model
|
|||
'billing_phone',
|
||||
'billing_email',
|
||||
'faker_mail',
|
||||
'shipping_email',
|
||||
'accepted_data_checkbox',
|
||||
'same_as_billing',
|
||||
'shipping_salutation',
|
||||
|
|
|
|||
|
|
@ -17,15 +17,25 @@ class Payment
|
|||
'failed' => "abbruch",
|
||||
'extern' => "extern",
|
||||
'invoice_open' => "Re. offen",
|
||||
'invoice_paid' => "Re. bezahlt",
|
||||
'invoice_non' => "keine Zahlung",
|
||||
'NULL' => 'keine Zahlung',
|
||||
];
|
||||
|
||||
public static $txaction_invoice = [
|
||||
'invoice_open' => "Re. offen",
|
||||
'invoice_paid' => "Re. bezahlt",
|
||||
'invoice_non' => 'keine Zahlung',
|
||||
];
|
||||
|
||||
public static $txaction_color = [
|
||||
'paid' => "success",
|
||||
'appointed' => "warning",
|
||||
'failed' => "danger",
|
||||
'extern' => "success",
|
||||
'invoice_open' => "warning",
|
||||
'invoice_paid' => "success",
|
||||
'invoice_non' => "failed",
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class Shop
|
|||
{
|
||||
public static function userOrders() {
|
||||
$shopping_users = ShoppingUser::whereHas('shopping_order', function($q) {
|
||||
$q->where('txaction', 'paid')->OrWhere('txaction', 'appointed')->OrWhere('txaction', 'extern');
|
||||
$q->where('txaction', 'paid')->OrWhere('txaction', 'appointed')->OrWhere('txaction', 'extern')->OrWhere('txaction', 'invoice_open')->OrWhere('txaction', 'invoice_paid');
|
||||
})->where('orders', '=', NULL)->get();
|
||||
foreach ($shopping_users as $shopping_user) {
|
||||
if ($shopping_user->number) {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
namespace App\Services;
|
||||
|
||||
use App\Models\UserHistory;
|
||||
use Yard;
|
||||
|
||||
class Util
|
||||
{
|
||||
|
|
@ -158,9 +159,13 @@ class Util
|
|||
}
|
||||
|
||||
public static function getUserPaymentFor(){
|
||||
if(Yard::instance('shopping')->getYardExtra('user_shop_payment')){
|
||||
return Yard::instance('shopping')->getYardExtra('user_shop_payment');
|
||||
}
|
||||
if(\Session::has('user_shop_payment')){
|
||||
return \Session::get('user_shop_payment');
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,14 @@ class Yard extends Cart
|
|||
$this->shipping_price = (float) ($this->getYardExtra('shipping_price'));
|
||||
}
|
||||
|
||||
if($this->getYardExtra('shipping_price_net')){
|
||||
$this->shipping_price_net = (float) ($this->getYardExtra('shipping_price_net'));
|
||||
}
|
||||
|
||||
if($this->getYardExtra('shipping_tax_rate')){
|
||||
$this->shipping_tax_rate = (float) ($this->getYardExtra('shipping_tax_rate'));
|
||||
}
|
||||
|
||||
if($this->getYardExtra('shipping_tax')){
|
||||
$this->shipping_tax = (float) ($this->getYardExtra('shipping_tax'));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ class CreateShoppingUsersTable extends Migration
|
|||
$table->string('billing_phone')->nullable();
|
||||
$table->string('billing_email')->nullable();
|
||||
$table->boolean('faker_mail')->default(false);
|
||||
$table->string('shipping_email')->nullable();
|
||||
|
||||
$table->unsignedSmallInteger('orders')->nullable()->default(1);
|
||||
|
||||
|
|
|
|||
|
|
@ -24,21 +24,32 @@ class CreateShoppingOrdersTable extends Migration
|
|||
|
||||
$table->unsignedInteger('member_id')->nullable();
|
||||
|
||||
$table->unsignedTinyInteger('payment_for');
|
||||
$table->unsignedTinyInteger('payment_for')->nullable();
|
||||
|
||||
$table->decimal('total', 13, 2)->nullable();
|
||||
$table->decimal('shipping', 8, 2)->nullable();
|
||||
$table->decimal('subtotal', 13, 2)->nullable();
|
||||
$table->decimal('tax_rate', 5, 2)->nullable();
|
||||
|
||||
$table->decimal('shipping', 8, 2)->nullable();
|
||||
$table->decimal('shipping_net', 8, 2)->nullable();
|
||||
|
||||
$table->decimal('subtotal_ws', 13, 2)->nullable();
|
||||
$table->decimal('tax', 8, 2)->nullable();
|
||||
$table->decimal('total_shipping', 13, 2)->nullable();
|
||||
|
||||
$table->unsignedInteger('points')->nullable();
|
||||
|
||||
$table->unsignedInteger('weight')->nullable();
|
||||
|
||||
$table->boolean('paid')->default(false);
|
||||
$table->string('wp_invoice_path', 255)->nullable();
|
||||
$table->string('txaction', 20)->nullable()->index();
|
||||
|
||||
$table->unsignedTinyInteger('shipped')->default(0);
|
||||
$table->string('tracking', 255)->nullable();
|
||||
|
||||
|
||||
|
||||
|
||||
$table->char('mode', 4)->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ class CreateShoppingOrderItemsTable extends Migration
|
|||
$table->unsignedInteger('product_id');
|
||||
$table->unsignedInteger('qty');
|
||||
$table->decimal('price', 8, 2)->nullable();
|
||||
$table->decimal('price_net', 8, 3)->nullable();
|
||||
|
||||
$table->decimal('tax_rate', 5, 2)->nullable();
|
||||
$table->string('slug')->nullable();
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@
|
|||
'checkout_mail_hl1' => 'Du hast folgende Artikel bestellt:',
|
||||
'checkout_mail_shipping' => 'Verpackungs- u. Versandkosten',
|
||||
'checkout_mail_status_info' => 'Statusinfo:',
|
||||
'checkout_mail_subtotal_ws' => 'Summe ohne MwSt.',
|
||||
'checkout_mail_tax' => 'zzgl. MwSt',
|
||||
'checkout_mail_total' => 'Gesamtpreis',
|
||||
'checkout_mail_tax_info' => 'Preis inkl. MwSt',
|
||||
'checkout_mail_pay_info' => 'Zahlungsinfo:',
|
||||
|
|
@ -58,6 +60,11 @@
|
|||
'checkout_mail_your_mail' => 'Deine E-Mai:',
|
||||
'checkout_mail_invoice_addess' => 'Deine Rechnungsadresse:',
|
||||
'checkout_mail_deliver_addess' => 'Deine Lieferadresse:',
|
||||
'checkout_mail_deliver_customer' => 'Lieferadresse des Kunde:',
|
||||
'checkout_mail_order_for_me' => 'Beraterbestellung für Dich:',
|
||||
'checkout_mail_order_for_ot' => 'Beraterbestellung für Deinen Kunden:',
|
||||
'checkout_mail_order_for_wizard' => 'Beraterbestellung zur Deiner Registrierung:',
|
||||
'checkout_mail_order_for_membership' => 'Beraterbestellung für Deine Mitgliedschaft:',
|
||||
'checkout_mail_same_address' => 'Lieferadresse ist gleich Rechnungsadresse',
|
||||
'checkout_mail_pay_error' => 'Die Zahlung ist fehlgeschlagen!',
|
||||
'checkout_mail_pay_pre' => 'Bezahlung per Vorkasse:',
|
||||
|
|
|
|||
|
|
@ -2,11 +2,32 @@
|
|||
<div class="card">
|
||||
<!-- Status -->
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-md-6 mb-1">
|
||||
<strong class="mr-2">Status:</strong>
|
||||
<span class="text-big">
|
||||
{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order); !!}
|
||||
</span>
|
||||
<span class="text-muted ml-1">{{$shopping_order->created_at->format("d.m.Y")}}</span>
|
||||
</div>
|
||||
<div class="col-md-6 mb-1">
|
||||
<strong class="mr-2">Versand:</strong>
|
||||
|
||||
@if($isAdmin)
|
||||
<button type="button" class="btn btn-sm btn-{{$shopping_order->getShippedColor()}}" data-toggle="modal" data-target="#modals-shipped"
|
||||
data-id="{{ $shopping_order->id }}"
|
||||
data-shipped="{{ $shopping_order->shipped }}"
|
||||
data-back="{{url()->current()}}"
|
||||
data-action="store_shipped">
|
||||
<span class="far fa-edit"></span> <strong>{{$shopping_order->getShippedType()}}</strong>
|
||||
</button>
|
||||
@else
|
||||
<span class="text-big">
|
||||
<span class="badge badge-pill badge-{{$shopping_order->getShippedColor()}}">{{$shopping_order->getShippedType()}}</span>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
<!-- / Status -->
|
||||
|
|
@ -14,18 +35,22 @@
|
|||
<!-- Info -->
|
||||
<div class="card-body pb-1">
|
||||
<div class="row">
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Bestelldatum</div>
|
||||
{{$shopping_order->created_at->format("d.m.Y H:i")}}
|
||||
</div>
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Anzahl Artikel</div>
|
||||
{{$shopping_order->getItemsCount()}}
|
||||
</div>
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Preis gesamt</div>
|
||||
{{$shopping_order->getFormattedTotalShipping()}} €
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Points gesamt</div>
|
||||
{{ $shopping_order->points }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
|
|
@ -47,7 +72,6 @@
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="text-muted small">Zugewiesener Berater</div>
|
||||
@if($isView === 'sales_user')
|
||||
@if($shopping_order->user_shop)
|
||||
|
|
@ -78,7 +102,6 @@
|
|||
@endif
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="text-muted small">Gekauft im Shop</div>
|
||||
@if($shopping_order->user_shop->user->isActive() && $shopping_order->user_shop->user->isActiveShop())
|
||||
|
|
@ -96,7 +119,11 @@
|
|||
<!-- Billing -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Rechnungsadresse
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
Rechnungsadresse des Kunden
|
||||
@else
|
||||
Rechnungsadresse des Berater
|
||||
@endif
|
||||
</h6>
|
||||
<div class="row">
|
||||
@if($shopping_order->shopping_user->billing_company)
|
||||
|
|
@ -156,7 +183,22 @@
|
|||
<!-- Shipping -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Lieferadresse
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
Lieferadresse des Berater
|
||||
@else
|
||||
Lieferadresse des Kunden
|
||||
@endif
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'wizard')
|
||||
Lieferadresse des Berater
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'membership')
|
||||
Lieferadresse des Berater
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
Lieferadresse des Kunden
|
||||
@endif
|
||||
</h6>
|
||||
@if($shopping_order->shopping_user->same_as_billing)
|
||||
{{__('email.checkout_mail_same_address')}}
|
||||
|
|
@ -220,18 +262,52 @@
|
|||
<!-- Items -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Artikel
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
<strong>Bestellung für Berater</strong>
|
||||
@else
|
||||
<strong>Bestellung für Kunde</strong>
|
||||
@endif
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'wizard')
|
||||
<strong>Beraterbestellung für Registrierung</strong>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'membership')
|
||||
<strong>Beraterbestellung für Mitgliedschaft</strong>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
<strong>Kundenbestellung über Shop</strong>
|
||||
@endif
|
||||
</h6>
|
||||
<style>
|
||||
table.table-product, table.table-product tr td, table.table-product tr th {
|
||||
border:none;
|
||||
}
|
||||
table.table-product tr.border-top td {
|
||||
border-top: 1px solid #b8b8b9;
|
||||
}
|
||||
table.table-product tr.border-bottom td, table.table-product tr.border-bottom th {
|
||||
border-bottom: 1px solid #b8b8b9;
|
||||
}
|
||||
|
||||
</style>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered m-0" style="min-width:550px;">
|
||||
<table class="table table-product m-0" style="">
|
||||
<tbody>
|
||||
<tr>
|
||||
<tr class="border-bottom">
|
||||
<th>Produkt</th>
|
||||
<th>Anzahl</th>
|
||||
<th>Preis</th>
|
||||
<th class="text-right">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
Netto-Preis
|
||||
@else
|
||||
Preis
|
||||
@endif
|
||||
</th>
|
||||
<th class="text-right">Anzahl</th>
|
||||
<th class="text-right">Summe</th>
|
||||
</tr>
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<tr class="border-bottom">
|
||||
<td class="px-3 py-2">
|
||||
<div class="media align-items-center">
|
||||
@if($shopping_order_item->product->images)
|
||||
|
|
@ -251,17 +327,70 @@
|
|||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="align-middle px-3 py-2 nowrap text-right" style="min-width:100px;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
<!-- Set column width -->
|
||||
<td class="align-middle px-3 py-2" style="width: 66px;">
|
||||
<td class="align-middle px-3 py-2 text-right" style="min-width: 60px;">
|
||||
{{ $shopping_order_item->qty }}
|
||||
</td>
|
||||
<!-- Set column width -->
|
||||
<td class="text-right font-weight-semibold align-middle px-3 py-2" style="width: 100px;">
|
||||
{{ $shopping_order_item->getFormattedPrice() }} €
|
||||
<td class="font-weight-semibold align-middle px-3 py-2 text-right" style="min-width:120px;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedTotalPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedTotalPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr class="border-bottom">
|
||||
<td colspan="3">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@else
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<td colspan="3">
|
||||
{{__('email.checkout_mail_subtotal_ws')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedSubtotalWs() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="border-bottom">
|
||||
<td colspan="3">
|
||||
{{__('email.checkout_mail_tax')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedTax() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} €</b>
|
||||
<br>
|
||||
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -279,10 +408,10 @@
|
|||
<tr>
|
||||
<th style="min-width: 60px">#</th>
|
||||
<th>Zahlungsart</th>
|
||||
@if($isAdmin)<th>Referenznummer</th>@endif
|
||||
<th>Gesamt</th>
|
||||
<th>Status</th>
|
||||
<th>Datum</th>
|
||||
<th>Referenznummer</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -291,10 +420,23 @@
|
|||
<tr>
|
||||
<th scope="row">{{++$count}}</th>
|
||||
<td>{{$shopping_payment->getPaymentType()}}</td>
|
||||
@if($isAdmin)<td>{{$shopping_payment->reference}}</td>@endif
|
||||
<td>{{$shopping_payment->getPaymentAmount()}}</td>
|
||||
<td>{!! \App\Services\Payment::getShoppingPaymentBadge($shopping_payment) !!}</td>
|
||||
<td>
|
||||
@if($isAdmin && $shopping_payment->clearingtype === 'fnc' && $shopping_payment->onlinebanktransfertype === 'MIV')
|
||||
<button type="button" class="btn btn-sm btn-{{ \App\Services\Payment::getFormattedTxactionColor($shopping_payment->txaction)}}" data-toggle="modal" data-target="#modals-txaction"
|
||||
data-id="{{ $shopping_order->id }}"
|
||||
data-payment_id="{{ $shopping_payment->id }}"
|
||||
data-txaction="{{ $shopping_payment->txaction }}"
|
||||
data-back="{{url()->current()}}"
|
||||
data-action="store_txaction">
|
||||
<span class="far fa-edit"></span> <strong>{{ \App\Services\Payment::getFormattedTxaction($shopping_payment->txaction)}}</strong>
|
||||
</button>
|
||||
@else
|
||||
{!! \App\Services\Payment::getShoppingPaymentBadge($shopping_payment) !!}
|
||||
@endif
|
||||
</td>
|
||||
<td>{{$shopping_payment->created_at->format("d.m.Y H:i")}}</td>
|
||||
<td>{{$shopping_payment->reference}}</td>
|
||||
</tr>
|
||||
@if($isAdmin && $shopping_payment->payment_transactions)
|
||||
@php($ccount=0)
|
||||
|
|
@ -329,5 +471,78 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if($isAdmin)
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modals-shipped">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
|
||||
@csrf
|
||||
<input type="hidden" name="id" value="{{$shopping_order->id}}">
|
||||
<input type="hidden" name="action" value="store_shipped">
|
||||
<input type="hidden" name="back" value="{{url()->current()}}">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{__('Bestellung')}} {{__('Versand')}} </h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="form-label" for="shipped">{{ __('Versand') }}</label>
|
||||
{{ Form::select('shipped', \App\Models\ShoppingOrder::$shippedTypes, $shopping_order->shipped, array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modals-txaction">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
|
||||
@csrf
|
||||
<input type="hidden" name="id" value="{{$shopping_order->id}}">
|
||||
<input type="hidden" name="payment_id">
|
||||
<input type="hidden" name="action" value="store_txaction">
|
||||
<input type="hidden" name="back" value="{{url()->current()}}">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{__('Bestellung')}} {{__('Rechnung')}} </h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="form-label" for="txaction">{{ __('Rechnung') }}</label>
|
||||
{{ Form::select('txaction', \App\Services\Payment::$txaction_invoice, 'invoice_paid', array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
$('#modals-txaction').on('show.bs.modal', function (event) {
|
||||
var button = $(event.relatedTarget);
|
||||
$(this).find(".modal-content input[name='payment_id']").val(button.data('payment_id'));
|
||||
$(this).find(".modal-body select[name='txaction']").val(button.data('txaction'));
|
||||
$('.selectpicker').selectpicker('refresh');
|
||||
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@endif
|
||||
|
|
@ -49,14 +49,17 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Zahlung')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Versand')}}</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('zugewiesener Berater')}}</th>
|
||||
<th>{{__('Rf-Nr.')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Gekauft im Shop')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -78,15 +81,18 @@
|
|||
},
|
||||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', name: 'id', searchable: false },
|
||||
{ data: 'id', searchable: false },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'payment', name: 'payment', orderable: false },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'shipped', name: 'shipped' },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'created_at', name: 'created_at' },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
{ data: 'member_id', name: 'member_id', searchable: false, orderable: false },
|
||||
{ data: 'reference', name: 'reference' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
{ data: 'user_shop_id', name: 'user_shop_id', searchable: false, orderable: true },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
|
|
|
|||
|
|
@ -15,12 +15,20 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Zahlung')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Versand')}}</th>
|
||||
<th>{{__('Für')}}</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>B.{{__('First name')}}</th>
|
||||
<th>B.{{__('Last name')}}</th>
|
||||
<th>B.{{__('E-Mail')}}</th>
|
||||
|
||||
<th>{{__('Rf-Nr.')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Berater-Shop')}}</th>
|
||||
</tr>
|
||||
|
|
@ -37,12 +45,19 @@
|
|||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', searchable: false },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'payment', name: 'payment', orderable: false },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'shipped', name: 'shipped' },
|
||||
{ data: 'is_for', name: 'is_for', orderable: false },
|
||||
{ data: 'shopping_user.shipping_firstname', name: 'shopping_user.shipping_firstname', orderable: false },
|
||||
{ data: 'shopping_user.shipping_lastname', name: 'shopping_user.shipping_lastname', orderable: false },
|
||||
{ data: 'shopping_user.shipping_email', name: 'shopping_user.shipping_email', orderable: false },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname', orderable: false },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname', orderable: false },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email', orderable: false },
|
||||
{ data: 'reference', name: 'reference' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
{ data: 'auth_user_shop', name: 'auth_user_shop' },
|
||||
],
|
||||
|
|
|
|||
|
|
@ -149,55 +149,108 @@
|
|||
<tr>
|
||||
<td class="sub_headline">
|
||||
<hr><br>
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
<b>{{__('email.checkout_mail_order_for_me')}}</b>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_order_for_ot')}}</b>
|
||||
@endif
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'wizard')
|
||||
<b>{{__('email.checkout_mail_order_for_wizard')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'membership')
|
||||
<b>{{__('email.checkout_mail_order_for_membership')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
<b>{{__('email.checkout_mail_hl1')}}</b>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">Produkt</th>
|
||||
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
Netto-Preis
|
||||
@else
|
||||
Preis
|
||||
@endif
|
||||
</th>
|
||||
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">Anzahl</th>
|
||||
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">Summe</th>
|
||||
</tr>
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }} x
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->product->name }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->getFormattedPrice() }} EUR
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedTotalPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedTotalPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<td colspan="4">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedShipping() }} EUR
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@else
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<td colspan="4">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_subtotal_ws')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedSubtotalWs() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_tax')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedTax() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} €</b>
|
||||
<br>
|
||||
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
|
||||
</td>
|
||||
|
|
@ -311,7 +364,15 @@
|
|||
|
||||
<tr>
|
||||
<td class="sub_headline" style="line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
|
||||
@endif
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -182,7 +182,6 @@
|
|||
<b>{{__('email.checkout_mail_system_status')}} {{$txaction}}</b><br>
|
||||
|
||||
@endif
|
||||
|
||||
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
|
||||
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
|
||||
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
|
||||
|
|
@ -196,55 +195,108 @@
|
|||
<tr>
|
||||
<td class="sub_headline">
|
||||
<hr><br>
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
<b>{{__('email.checkout_mail_order_for_me')}}</b>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_order_for_ot')}}</b>
|
||||
@endif
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'wizard')
|
||||
<b>{{__('email.checkout_mail_order_for_wizard')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'membership')
|
||||
<b>{{__('email.checkout_mail_order_for_membership')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
<b>{{__('email.checkout_mail_hl1')}}</b>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">Produkt</th>
|
||||
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
Netto-Preis
|
||||
@else
|
||||
Preis
|
||||
@endif
|
||||
</th>
|
||||
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">Anzahl</th>
|
||||
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">Summe</th>
|
||||
</tr>
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }} x
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->product->name }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->getFormattedPrice() }} EUR
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedTotalPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedTotalPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<td colspan="4">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedShipping() }} EUR
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@else
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<td colspan="4">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_subtotal_ws')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedSubtotalWs() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_tax')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedTax() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} €</b>
|
||||
<br>
|
||||
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
|
||||
</td>
|
||||
|
|
@ -264,7 +316,6 @@
|
|||
</td>
|
||||
<tr>
|
||||
<td style="color:#37302d; ">
|
||||
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
|
|
@ -301,7 +352,15 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}:</b>
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
|
||||
@endif
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -312,7 +371,6 @@
|
|||
@if($shopping_order->shopping_user->same_as_billing)
|
||||
{{__('email.checkout_mail_same_address')}}
|
||||
@else
|
||||
|
||||
@if($shopping_order->shopping_user->shipping_company)
|
||||
{{ $shopping_order->shopping_user->shipping_company }}<br>
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="text-left" style="display: none" id="show-button-without-email">
|
||||
<p class="mt-2">Hinweis: Der Kunden bekommt eine Platzhalter E-Mail (...@faker-mivita.care), da die E-Mail das primäre Feld für die Kundenhoheit ist.<br>
|
||||
<p class="mt-2">Hinweis: Der Kunden bekommt eine Platzhalter E-Mail (...-faker@mivita.care), da die E-Mail das primäre Feld für die Kundenhoheit ist.<br>
|
||||
Wird der Kunden mit seiner E-Mail von einem anderen Berater angelegt oder bestellt in einem anderen Beratershop, wird dem Berater der Kunde zugewiesen.</p>
|
||||
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_without_email">{{ __('weiter ohne E-Mail') }}</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -12,13 +12,16 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Zahlung')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Versand')}}</th>
|
||||
<th>{{__('Für')}}</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Rf-Nr.')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
|
|
@ -33,13 +36,16 @@
|
|||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', searchable: false },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
{ data: 'payment', name: 'payment', orderable: false },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'shipped', name: 'shipped' },
|
||||
{ data: 'is_for', name: 'is_for', orderable: false },
|
||||
{ data: 'shopping_user.shipping_firstname', name: 'shopping_user.shipping_firstname', orderable: false },
|
||||
{ data: 'shopping_user.shipping_lastname', name: 'shopping_user.shipping_lastname', orderable: false },
|
||||
{ data: 'shopping_user.shipping_email', name: 'shopping_user.shipping_email', orderable: false },
|
||||
{ data: 'reference', name: 'reference' },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
|
|
|
|||
|
|
@ -176,6 +176,7 @@
|
|||
<!-- BILLING -->
|
||||
<fieldset class="mb-0 box-border-shadow p-20">
|
||||
<h4>Rechnung & Versand</h4>
|
||||
|
||||
<hr />
|
||||
@if($is_from === 'shopping')
|
||||
<div class="is_from_shopping">
|
||||
|
|
@ -287,24 +288,6 @@
|
|||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<hr>
|
||||
<label class="checkbox {{ ($errors->has('accepted_data_checkbox') ? 'error' : '') }}" for="accepted_data_checkbox" style="font-size: 14px;line-height: 22px; font-weight: 400">
|
||||
{!! Form::checkbox('accepted_data_checkbox', 1, $shopping_user->accepted_data_checkbox, ['id'=>'accepted_data_checkbox', 'class' => 'form-control '.($errors->has('accepted_data_checkbox') ? 'error' : '')]) !!}
|
||||
|
||||
@if($shopping_user->auth_user_id)
|
||||
<i></i> Mit Klick auf "Jetzt kaufen" akzeptiere ich die Allgemeinen Geschäftsbedingungen und die Datenschutzbelehrung, damit für die Bestellung meine Daten verarbeitet werden können.
|
||||
@else
|
||||
<i></i> Mit Klick auf "Jetzt kaufen" akzeptiere ich die <a href="{{ url('/agb') }}">Allgemeinen Geschäftsbedingungen</a>, die <a target="_blank" href="{{ asset('download/mivita_widerruf_formular.pdf') }}">Widerrufsbelehrung</a> und die <a href="{{ url('/datenschutz') }}">Datenschutzerklärung</a>, damit für die Bestellung meine Daten verarbeitet werden können.
|
||||
@endif
|
||||
</label>
|
||||
@if ($errors->has('accepted_data_checkbox'))
|
||||
<label for="accepted_data_checkbox" class="error text-danger small" style="display: block;">{{ $errors->first('accepted_data_checkbox') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="is_from_user">
|
||||
|
|
@ -372,7 +355,7 @@
|
|||
{{ $shopping_user->billing_email }}
|
||||
</div>
|
||||
</div>
|
||||
<p class="text-muted small mb-0">Hinterlegte Rechnungsdaten von Beratern können nur im Salescenter geändert werden.</p>
|
||||
<p class="text-muted small mb-0"><i>Deine hinterlegten Rechnungsdaten können nur im Salescenter geändert werden.</i></p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
|
@ -412,7 +395,16 @@
|
|||
<!-- SHIPPING -->
|
||||
<fieldset id="shipping" class="softhide mt-40">
|
||||
<div class="box-border-shadow p-20">
|
||||
|
||||
@if($shopping_user->is_from === 'user_order')
|
||||
@if($shopping_user->is_for === 'me')
|
||||
<h4>Meine Lieferadresse</h4>
|
||||
@else
|
||||
<h4>Lieferadresse des Kunden</h4>
|
||||
@endif
|
||||
@else
|
||||
<h4>Versand Adresse</h4>
|
||||
@endif
|
||||
|
||||
<hr />
|
||||
|
||||
|
|
@ -555,6 +547,7 @@
|
|||
|
||||
@if(($shopping_user->abo_options === 1) && (Util::getUserPaymentFor() >= 3))
|
||||
|
||||
|
||||
@if(array_key_exists('SEPA', $payment_methods_active) && in_array($payment_methods_active['SEPA'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
|
|
@ -576,6 +569,7 @@
|
|||
</label>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if(array_key_exists('CC', $payment_methods_active) && in_array($payment_methods_active['CC'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
|
||||
|
|
@ -615,7 +609,7 @@
|
|||
@if(array_key_exists('FNC', $payment_methods_active) && in_array($payment_methods_active['FNC'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
<input name="payment_method" type="radio" value="fnc#MIV" />
|
||||
{!! Form::radio('payment_method', 'fnc#MIV', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Rechnungskauf</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/fnc.png')}}" alt="Vorkasse">
|
||||
</label>
|
||||
|
|
@ -671,18 +665,18 @@
|
|||
<label class="mt-0 fs-14 fw-400">Inhaber*</label>
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
{!! Form::text('elv_bankaccountholder', '', ['class' => 'form-control', 'id'=>'elv_bankaccountholder', 'placeholder'=>'Vorname Nachname']) !!}
|
||||
{!! Form::text('elv_bankaccountholder', (isset($payment_data['bankaccountholder']) ? $payment_data['bankaccountholder'] : ''), ['class' => 'form-control', 'id'=>'elv_bankaccountholder', 'placeholder'=>'Vorname Nachname']) !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400">IBAN*</label>
|
||||
{!! Form::text('elv_iban', '', ['class' => 'form-control', 'id'=>'elv_iban', 'placeholder'=>'Beisp.: DE02120300000000202051']) !!}
|
||||
{!! Form::text('elv_iban', (isset($payment_data['iban']) ? $payment_data['iban'] : ''), ['class' => 'form-control', 'id'=>'elv_iban', 'placeholder'=>'Beisp.: DE02120300000000202051']) !!}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400">BIC*</label>
|
||||
{!! Form::text('elv_bic', '', ['class' => 'form-control', 'id'=>'elv_bic', 'placeholder'=>'Beisp.: PBNKDEFF']) !!}
|
||||
{!! Form::text('elv_bic', (isset($payment_data['bic']) ? $payment_data['bic'] : ''), ['class' => 'form-control', 'id'=>'elv_bic', 'placeholder'=>'Beisp.: PBNKDEFF']) !!}
|
||||
</div>
|
||||
@if($shopping_user->abo_options)
|
||||
<p>Automatische Verlängerung wurde ausgewählt. Dein SEPA-Mandart wird gespeichert und die jährliche Zahlung automatisch ausgeführt.</p>
|
||||
|
|
@ -771,7 +765,19 @@
|
|||
<div class="toggle-transparent toggle-bordered-full clearfix">
|
||||
<div class="toggle active">
|
||||
<div class="toggle-content">
|
||||
@if($is_from === 'user_order')
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right">{{ Yard::instance('shopping')->subtotal() }} €</span>
|
||||
<strong class="pull-left">Zwischensumme:</strong>
|
||||
</div>
|
||||
|
||||
<hr class="mt-4 mb-4">
|
||||
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small">{{ Yard::instance('shopping')->shippingNet() }} € </span>
|
||||
<span class="pull-left small">Versandkosten:</span>
|
||||
</div>
|
||||
@else
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right">{{ Yard::instance('shopping')->total() }} €</span>
|
||||
<strong class="pull-left">Zwischensumme:</strong>
|
||||
|
|
@ -783,6 +789,7 @@
|
|||
<span class="pull-right small">{{ Yard::instance('shopping')->shipping() }} € </span>
|
||||
<span class="pull-left small">Versandkosten:</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small">{{ Yard::instance('shopping')->getShippingCountryName() }}</span>
|
||||
|
|
|
|||
|
|
@ -348,12 +348,14 @@ Route::domain(config('app.pre_url_crm').config('app.domain').config('app.tld_car
|
|||
Route::post('/admin/sales/users/detail/{id}', 'SalesController@usersStore')->name('admin_sales_users_detail');
|
||||
Route::get('/admin/sales/users/datatable', 'SalesController@usersDatatable')->name('admin_sales_users_datatable');
|
||||
|
||||
|
||||
Route::get('/admin/sales/customers', 'SalesController@customers')->name('admin_sales_customers');
|
||||
Route::get('/admin/sales/customers/detail/{id}', 'SalesController@customersDetail')->name('admin_sales_customers_detail');
|
||||
Route::post('/admin/sales/customers/detail/{id}', 'SalesController@customersStore')->name('admin_sales_customers_detail');
|
||||
Route::get('/admin/sales/customers/datatable', 'SalesController@customersDatatable')->name('admin_sales_customers_datatable');
|
||||
|
||||
Route::post('/admin/sales/sore', 'SalesController@store')->name('admin_sales_store');
|
||||
|
||||
|
||||
});
|
||||
|
||||
//login pages for superadmin
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue