diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1df9298..ac59790 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,9 +5,30 @@ + - + + + + + + + + + + + + + + + + + + + + + + - @@ -551,6 +580,23 @@ + + + + + + + + + + + + + + + + + diff --git a/app/Http/Controllers/Api/ShoppingUserController.php b/app/Http/Controllers/Api/ShoppingUserController.php index bac2629..0cb809d 100755 --- a/app/Http/Controllers/Api/ShoppingUserController.php +++ b/app/Http/Controllers/Api/ShoppingUserController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Api; +use App\Mail\MailCheckout; use App\Models\Country; use App\Models\Product; use App\Models\ShippingCountry; @@ -12,6 +13,7 @@ use App\Services\CustomerPriority; use Illuminate\Http\Request; use App\Http\Controllers\Controller; use Carbon\Carbon; +use Illuminate\Support\Facades\Mail; use PHPUnit\Framework\Constraint\Count; use Yard; @@ -34,7 +36,6 @@ class ShoppingUserController extends Controller */ public function status(Request $request) { - //$this->member_id = auth()->user()->m_sponsor; $request->validate([ 'wp_order_numbers' => 'required', @@ -55,17 +56,18 @@ class ShoppingUserController extends Controller 'time' => Carbon::now()->toDateTimeString() ], 400); } + $status = []; - //TODO Status foreach ($wp_order_numbers as $wp_order_number){ $shopping_user = ShoppingUser::where('wp_order_number', '=', $wp_order_number)->first(); $status[] = [ 'wp_order_number' => $wp_order_number, 'user' => $shopping_user ? true : false, 'order' => ($shopping_user && $shopping_user->shopping_order) ? true : false, - 'status' => 'free', + 'status' => $shopping_user ? $shopping_user->getAPIShippedType() : false, ]; } + return response()->json([ 'success' => true, 'data' => $status, @@ -74,6 +76,112 @@ class ShoppingUserController extends Controller } + /** + * @param Request $request + * wp_order_number [1234] + * @return \Illuminate\Http\JsonResponse + */ + public function cancel(Request $request) + { + $request->validate([ + 'wp_order_number' => 'required|int', + ]); + $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first(); + if (!$shopping_user) { + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found', + 'order' => false, + 'status' => false, + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + if(!$shopping_user->shopping_order){ + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' has no order', + 'order' => false, + 'status' => $shopping_user->getAPIShippedType(), + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + if($shopping_user->shopping_order->shipped > 0){ + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' can not cancel', + 'order' => true, + 'status' => $shopping_user->getAPIShippedType(), + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + + $shopping_user->shopping_order->shipped = 10; + $shopping_user->shopping_order->save(); + + return response()->json([ + 'success' => true, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' is cancel', + 'order' => true, + 'status' => $shopping_user->getAPIShippedType(), + 'time' => Carbon::now()->toDateTimeString() + ], 200); + + } + + + /** + * @param Request $request + * wp_order_number [1234] + * @return \Illuminate\Http\JsonResponse + */ + public function open(Request $request) + { + $request->validate([ + 'wp_order_number' => 'required|int', + ]); + $shopping_user = ShoppingUser::where('wp_order_number', '=', $request->wp_order_number)->first(); + if (!$shopping_user) { + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' not found', + 'order' => false, + 'status' => false, + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + if(!$shopping_user->shopping_order){ + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' has no order', + 'order' => false, + 'status' => $shopping_user->getAPIShippedType(), + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + if($shopping_user->shopping_order->shipped !== 10){ + return response()->json([ + 'success' => false, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' can not open', + 'order' => true, + 'status' => $shopping_user->getAPIShippedType(), + 'time' => Carbon::now()->toDateTimeString() + ], 400); + } + + $shopping_user->shopping_order->shipped = 0; + $shopping_user->shopping_order->save(); + + return response()->json([ + 'success' => true, + 'message' => 'Entry with wp_order_number ' . $request->wp_order_number . ' is open', + 'order' => true, + 'status' => $shopping_user->getAPIShippedType(), + 'time' => Carbon::now()->toDateTimeString() + ], 200); + + } + + /** * @param Request $request * wp_order_numbers [1234, 1234] @@ -110,16 +218,13 @@ class ShoppingUserController extends Controller $user = $this->prepareForShow($shopping_user); $order = $this->prepareForShowOrder($shopping_user->shopping_order); } - //TODO Status - $data[] = [ 'wp_order_number' => $wp_order_number, 'user' => $user, 'order' => $order, 'customer_number' => $shopping_user ? $shopping_user->number : false, 'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false, - 'status' => 'free', - ]; + 'status' => $shopping_user ? $shopping_user->getAPIShippedType() : false, ]; } return response()->json([ 'success' => true, @@ -153,6 +258,8 @@ class ShoppingUserController extends Controller $data['member_id'] = $this->member_id ; $data['number'] = ShoppingUser::max('number') + 1; $data['mode'] = $request->mode ? $request->mode : 'live'; + $data['is_from'] = 'extern'; + $data['is_for'] = 'ot'; $shopping_user = ShoppingUser::create($data); @@ -198,7 +305,7 @@ class ShoppingUserController extends Controller $priority = CustomerPriority::checkChangeOne($shopping_user, $data, true); $updated = $shopping_user->fill($data)->save(); \App\Services\Shop::newUserOrder($shopping_user->number); - //TODO Status + if ($updated){ $user = $this->prepareForShow($shopping_user); $order = $this->prepareForShowOrder($shopping_user->shopping_order); @@ -211,7 +318,7 @@ class ShoppingUserController extends Controller 'customer_priority' => $priority, 'customer_number' => $shopping_user ? $shopping_user->number : false, 'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false, - 'status' => 'free', + 'status' => $shopping_user ? $shopping_user->getAPIShippedType() : false, ], 'time' => Carbon::now()->toDateTimeString() ], 200); @@ -254,9 +361,16 @@ class ShoppingUserController extends Controller } $wp_invoice_path = isset($request->wp_invoice_path) ? $request->wp_invoice_path : null; - $wp_order = $this->prepareOrder($wp_order, $shopping_user, $wp_invoice_path); + $wp_advertising = isset($request->wp_advertising) ? $request->wp_advertising : ''; + $wp_incentives = isset($request->wp_incentives) ? $request->wp_incentives : ''; + + $wp_notice = [ + 'wp_advertising' => $wp_advertising, + 'wp_incentives' => $wp_incentives, + ]; + + $wp_order = $this->prepareOrder($wp_order, $shopping_user, $wp_invoice_path, $wp_notice); - //TODO Status if ($wp_order){ $user = $this->prepareForShow($shopping_user); $order = $this->prepareForShowOrder($shopping_user->shopping_order); @@ -265,12 +379,14 @@ class ShoppingUserController extends Controller 'data' => [ 'wp_order_number' => $shopping_user->wp_order_number, 'wp_invoice_path' => $wp_invoice_path, + 'wp_advertising' => $wp_advertising, + 'wp_incentives' => $wp_incentives, 'wp_order' => $wp_order, 'user' => $user, 'order' => $order, 'customer_number' => $shopping_user->number, 'member_email' => $shopping_user->member->email, - 'status' => 'free', + 'status' => $shopping_user->getAPIShippedType(), ], 'time' => Carbon::now()->toDateTimeString() ], 200); @@ -458,7 +574,7 @@ class ShoppingUserController extends Controller return $ret; } - private function prepareOrder($wp_shopping_order, $shopping_user, $wp_invoice_path){ + private function prepareOrder($wp_shopping_order, $shopping_user, $wp_invoice_path, $wp_notice){ Yard::instance('shopping')->destroy(); $ret = []; @@ -489,14 +605,16 @@ class ShoppingUserController extends Controller if($ShippingCountry){ Yard::instance('shopping')->setShippingCountryWithPrice($ShippingCountry->id); } - $shopping_order = $this->makeShoppingOrder($shopping_user, $wp_invoice_path); + $shopping_order = $this->makeShoppingOrder($shopping_user, $wp_invoice_path, $wp_notice); + $this->orderStatusSendMail($shopping_order); + $shopping_user->shopping_order = $shopping_order; Yard::instance('shopping')->destroy(); } return $ret; } - private function makeShoppingOrder($shopping_user, $wp_invoice_path){ + private function makeShoppingOrder($shopping_user, $wp_invoice_path, $wp_notice){ $data = [ 'shopping_user_id' => $shopping_user->id, @@ -505,15 +623,18 @@ class ShoppingUserController extends Controller 'user_shop_id' => auth()->user()->user_sponsor->shop->id, 'member_id' => $shopping_user->member_id, '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(), 'paid' => true, 'txaction' => 'extern', 'wp_invoice_path' => $wp_invoice_path, + 'wp_notice' => $wp_notice, 'mode' => $shopping_user->mode, ]; $shopping_order = $shopping_user->shopping_order; @@ -534,6 +655,7 @@ class ShoppingUserController 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(); @@ -552,11 +674,27 @@ class ShoppingUserController 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 ]); } + return $shopping_order; } + + public function orderStatusSendMail(ShoppingOrder $shopping_order){ + + $bcc = []; + $user_mail = $shopping_order->shopping_user->member->email; + if($shopping_order->mode === 'dev'){ + $bcc[] = config('app.checkout_test_mail'); + }else{ + $bcc[] = config('app.checkout_mail'); + } + + Mail::to($user_mail)->bcc($bcc)->send(new MailCheckout($shopping_order->txaction, $shopping_order, null, false, $shopping_order->mode)); + } + } \ No newline at end of file diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index 92fc196..6979237 100755 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -65,6 +65,18 @@ class ProductController extends Controller $rules = array( 'name' => 'required', ); + /*if(isset($data['number']) && $data['number'] != ""){ + $rules['number'] = 'int'; + }*/ + if(isset($data['wp_number'])){ + if($data['id'] !== "new"){ + $model = Product::findOrFail($data['id']); + $rules['wp_number'] = 'unique:products,wp_number,'.$model->id; + }else{ + $rules['wp_number'] = 'unique:products,wp_number'; + + } + } $validator = Validator::make(Request::all(), $rules); if($data['id'] === "new"){ @@ -72,8 +84,12 @@ class ProductController extends Controller }else{ $model = Product::findOrFail($data['id']); } + $country_for_prices = Country::where('own_eur', '=', true)->orWhere('currency', '=', true)->get(); + $data = [ 'product' => $model, + 'country_for_prices' => $country_for_prices, + ]; if ($validator->fails()) { diff --git a/app/Http/Controllers/SalesController.php b/app/Http/Controllers/SalesController.php index 5c35aae..04d296f 100755 --- a/app/Http/Controllers/SalesController.php +++ b/app/Http/Controllers/SalesController.php @@ -31,8 +31,14 @@ class SalesController extends Controller public function usersDetail($id) { + $ShoppingOrder = ShoppingOrder::find($id); + if($ShoppingOrder->shipped === 0){ + $ShoppingOrder->shipped = 1; + $ShoppingOrder->save(); + } + $data = [ - 'shopping_order' => ShoppingOrder::find($id), + 'shopping_order' => $ShoppingOrder, 'isAdmin' => true, 'isView' => 'sales_user', ]; @@ -126,8 +132,13 @@ class SalesController extends Controller public function customersDetail($id) { + $ShoppingOrder = ShoppingOrder::find($id); + if($ShoppingOrder->shipped === 0){ + $ShoppingOrder->shipped = 1; + $ShoppingOrder->save(); + } $data = [ - 'shopping_order' => ShoppingOrder::find($id), + 'shopping_order' => $ShoppingOrder, 'isAdmin' => true, 'isView' => 'sales_customer', ]; diff --git a/app/Http/Controllers/Web/ContactController.php b/app/Http/Controllers/Web/ContactController.php index 0838260..1af7609 100755 --- a/app/Http/Controllers/Web/ContactController.php +++ b/app/Http/Controllers/Web/ContactController.php @@ -82,11 +82,11 @@ class ContactController extends Controller } - $checkout_mail = config('app.contact_mail'); + $contact_mail = config('app.contact_mail'); if($user_shop){ - Mail::to($contact['email'])->bcc([$user_shop->user->email, $checkout_mail])->send(new MailContact($contact)); + Mail::to($contact['email'])->bcc([$user_shop->user->email, $contact_mail])->send(new MailContact($contact)); }else{ - Mail::to($contact['email'])->bcc($checkout_mail)->send(new MailContact($contact)); + Mail::to($contact['email'])->bcc($contact_mail)->send(new MailContact($contact)); } $data = [ diff --git a/app/Mail/MailCheckout.php b/app/Mail/MailCheckout.php index f607cb8..1ee1ef9 100644 --- a/app/Mail/MailCheckout.php +++ b/app/Mail/MailCheckout.php @@ -32,26 +32,31 @@ class MailCheckout extends Mailable if($this->txaction === 'paid'){ $this->subject = __('email.checkout_subject_paid')." "; + $this->subject .= "mivita.care"; + }elseif($this->txaction === 'extern'){ + $this->subject = __('email.checkout_subject_extern').": "; + $this->subject .= $shopping_order->member->account->m_first_name." ".$shopping_order->member->account->m_last_name." - "; + $this->subject .= $shopping_order->shopping_user->billing_firstname." ".$shopping_order->shopping_user->billing_lastname; }else{ $this->subject = __('email.checkout_subject')." "; + $this->subject .= "mivita.care"; } /*if($shopping_order->user_shop){ $this->subject .= $shopping_order->user_shop->slug."."; }*/ - $this->subject .= "mivita.care"; } public function build() { - $salutation = __('email.salutation').","; + $salutation = __('email.hello').","; - if($this->shopping_order->shopping_user){ + if($this->txaction !== 'extern' && $this->shopping_order->shopping_user){ $salutation = __('email.hello')." ".$this->shopping_order->shopping_user->billing_firstname.","; //make Adresse } - if($this->txaction === 'paid'){ + if($this->txaction === 'paid' || $this->txaction === 'extern'){ return $this->view('emails.checkout')->with([ 'salutation' => $salutation, 'copy1line' => __('email.checkout_copy1line'), diff --git a/app/Models/ShippingPrice.php b/app/Models/ShippingPrice.php index 724ee3b..1e1cf5f 100644 --- a/app/Models/ShippingPrice.php +++ b/app/Models/ShippingPrice.php @@ -71,7 +71,7 @@ class ShippingPrice extends Model $this->attributes['factor'] = $value ? Util::reFormatNumber($value) : null; } - public function setTaxAttribute($value) + public function setTaxRateAttribute($value) { $this->attributes['tax_rate'] = $value ? Util::reFormatNumber($value) : null; } diff --git a/app/Models/ShoppingOrder.php b/app/Models/ShoppingOrder.php index 8513290..6afb441 100644 --- a/app/Models/ShoppingOrder.php +++ b/app/Models/ShoppingOrder.php @@ -107,28 +107,41 @@ class ShoppingOrder extends Model 'paid', 'txaction', 'wp_invoice_path', + 'wp_notice', 'mode', 'shipped', 'tracking' ]; + protected $casts = [ + 'wp_notice' => 'array', + ]; + public static $shippedTypes = [ 0 => 'offen', - 1 => 'versendet', - 2 => 'abgeschlossen', - 4 => 'In Bearbeitung', + 1 => 'in Bearbeitung', + 2 => 'versendet', + 3 => 'abgeschlossen', + 10 => 'storniert' + ]; - 50 => 'storiniert' + public static $apiShippedTypes = [ + 0 => 'open', //(Fullfilment durch Händler)', + 1 => 'process', //(Fullfilment durch MIVITA: nicht Versand) + 2 => 'sent', //(Fullfilment durch MIVITA: Versand erfolgt)' + 3 => 'close', //(Fullfilment durch MIVITA: Versand erfolgt)', + 10 => 'cancel' ]; public static $shippedColors = [ 0 => 'warning', - 1 => 'success', + 1 => 'info', 2 => 'success', - 4 => 'info', - 50 => 'danger', + 3 => 'secondary', + 10 => 'danger', ]; + public function shopping_user() { return $this->belongsTo('App\Models\ShoppingUser','shopping_user_id'); @@ -205,6 +218,10 @@ class ShoppingOrder extends Model return isset(self::$shippedTypes[$this->shipped]) ? self::$shippedTypes[$this->shipped] : ""; } + public function getAPIShippedType(){ + return isset(self::$apiShippedTypes[$this->shipped]) ? self::$apiShippedTypes[$this->shipped] : "free"; + } + public function getShippedColor(){ return isset(self::$shippedColors[$this->shipped]) ? self::$shippedColors[$this->shipped] : "default"; } diff --git a/app/Models/ShoppingUser.php b/app/Models/ShoppingUser.php index ad6269b..6110a28 100644 --- a/app/Models/ShoppingUser.php +++ b/app/Models/ShoppingUser.php @@ -176,6 +176,8 @@ class ShoppingUser extends Model 'wp_order_number' => 'int', ]; + + //can null public function member() { @@ -243,4 +245,11 @@ class ShoppingUser extends Model } return $this; } + + public function getAPIShippedType() { + if($this->shopping_order){ + return $this->shopping_order->getAPIShippedType(); + } + return "free"; + } } \ No newline at end of file diff --git a/app/Repositories/ProductRepository.php b/app/Repositories/ProductRepository.php index 8dc2a3d..432148b 100644 --- a/app/Repositories/ProductRepository.php +++ b/app/Repositories/ProductRepository.php @@ -138,6 +138,7 @@ class ProductRepository extends BaseRepository { { $this->model = $model->replicate(); $this->model->name = "Kopie: ".$this->model->name; + $this->model->wp_number = null; $this->model->save(); //categories diff --git a/config/cart.php b/config/cart.php index 5e766e5..df3cbc0 100644 --- a/config/cart.php +++ b/config/cart.php @@ -12,7 +12,7 @@ return [ | */ - 'tax' => 16, + 'tax' => 19, /* |-------------------------------------------------------------------------- diff --git a/config/mail.php b/config/mail.php index 53c518f..28e15a1 100755 --- a/config/mail.php +++ b/config/mail.php @@ -56,7 +56,7 @@ return [ */ 'from' => [ - 'address' => env('MAIL_FROM_ADDRESS', 'checkout@mivita.care'), + 'address' => env('MAIL_FROM_ADDRESS', 'bestellungen@mivita.care'), 'name' => env('MAIL_FROM_NAME', 'mivita.care'), ], diff --git a/database/migrations/2019_02_23_163527_create_shopping_orders_table.php b/database/migrations/2019_02_23_163527_create_shopping_orders_table.php index d3e8065..e1a23a3 100644 --- a/database/migrations/2019_02_23_163527_create_shopping_orders_table.php +++ b/database/migrations/2019_02_23_163527_create_shopping_orders_table.php @@ -43,6 +43,8 @@ class CreateShoppingOrdersTable extends Migration $table->boolean('paid')->default(false); $table->string('wp_invoice_path', 255)->nullable(); + $table->text('wp_notice')->nullable(); + $table->string('txaction', 20)->nullable()->index(); $table->unsignedTinyInteger('shipped')->default(0); diff --git a/public/fonts/roboto.css b/public/fonts/roboto.css new file mode 100755 index 0000000..ce14243 --- /dev/null +++ b/public/fonts/roboto.css @@ -0,0 +1,117 @@ +/* roboto-300 - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: url('./roboto/roboto-v20-latin-300.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-300.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-300.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-300.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-300italic - latin */ +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 300; + src: url('./roboto/roboto-v20-latin-300italic.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-300italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-300italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-300italic.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-300italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-300italic.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-regular - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('./roboto/roboto-v20-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-500 - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: url('./roboto/roboto-v20-latin-500.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-500.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-500.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-500.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-italic - latin */ +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 400; + src: url('./roboto/roboto-v20-latin-italic.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-italic.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-italic.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-500italic - latin */ +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: url('./roboto/roboto-v20-latin-500italic.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-500italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-500italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-500italic.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-500italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-500italic.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-700 - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: url('./roboto/roboto-v20-latin-700.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-700.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-700.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-700.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-700italic - latin */ +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 700; + src: url('./roboto/roboto-v20-latin-700italic.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-700italic.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-700italic.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-900 - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: url('./roboto/roboto-v20-latin-900.eot'); /* IE9 Compat Modes */ + src: local(''), + url('./roboto/roboto-v20-latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./roboto/roboto-v20-latin-900.woff2') format('woff2'), /* Super Modern Browsers */ + url('./roboto/roboto-v20-latin-900.woff') format('woff'), /* Modern Browsers */ + url('./roboto/roboto-v20-latin-900.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./roboto/roboto-v20-latin-900.svg#Roboto') format('svg'); /* Legacy iOS */ +} \ No newline at end of file diff --git a/public/fonts/roboto/roboto-v20-latin-300.eot b/public/fonts/roboto/roboto-v20-latin-300.eot new file mode 100644 index 0000000..574375d Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-300.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-300.svg b/public/fonts/roboto/roboto-v20-latin-300.svg new file mode 100644 index 0000000..4ded944 --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-300.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-300.ttf b/public/fonts/roboto/roboto-v20-latin-300.ttf new file mode 100644 index 0000000..57a24e8 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-300.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-300.woff b/public/fonts/roboto/roboto-v20-latin-300.woff new file mode 100644 index 0000000..2f6bdb5 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-300.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-300.woff2 b/public/fonts/roboto/roboto-v20-latin-300.woff2 new file mode 100644 index 0000000..ef8c883 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-300.woff2 differ diff --git a/public/fonts/roboto/roboto-v20-latin-300italic.eot b/public/fonts/roboto/roboto-v20-latin-300italic.eot new file mode 100644 index 0000000..c6fd27f Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-300italic.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-300italic.svg b/public/fonts/roboto/roboto-v20-latin-300italic.svg new file mode 100644 index 0000000..758402b --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-300italic.svg @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-300italic.ttf b/public/fonts/roboto/roboto-v20-latin-300italic.ttf new file mode 100644 index 0000000..61d95b8 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-300italic.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-300italic.woff b/public/fonts/roboto/roboto-v20-latin-300italic.woff new file mode 100644 index 0000000..57c12ee Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-300italic.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-300italic.woff2 b/public/fonts/roboto/roboto-v20-latin-300italic.woff2 new file mode 100644 index 0000000..b6653fb Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-300italic.woff2 differ diff --git a/public/fonts/roboto/roboto-v20-latin-500.eot b/public/fonts/roboto/roboto-v20-latin-500.eot new file mode 100644 index 0000000..2ec7bdd Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-500.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-500.svg b/public/fonts/roboto/roboto-v20-latin-500.svg new file mode 100644 index 0000000..67eecf4 --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-500.svg @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-500.ttf b/public/fonts/roboto/roboto-v20-latin-500.ttf new file mode 100644 index 0000000..dd04ff1 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-500.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-500.woff b/public/fonts/roboto/roboto-v20-latin-500.woff new file mode 100644 index 0000000..8699258 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-500.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-500.woff2 b/public/fonts/roboto/roboto-v20-latin-500.woff2 new file mode 100644 index 0000000..6362d7f Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-500.woff2 differ diff --git a/public/fonts/roboto/roboto-v20-latin-500italic.eot b/public/fonts/roboto/roboto-v20-latin-500italic.eot new file mode 100644 index 0000000..d9d0600 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-500italic.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-500italic.svg b/public/fonts/roboto/roboto-v20-latin-500italic.svg new file mode 100644 index 0000000..bed50dc --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-500italic.svg @@ -0,0 +1,326 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-500italic.ttf b/public/fonts/roboto/roboto-v20-latin-500italic.ttf new file mode 100644 index 0000000..e62fa93 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-500italic.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-500italic.woff b/public/fonts/roboto/roboto-v20-latin-500italic.woff new file mode 100644 index 0000000..b794d20 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-500italic.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-500italic.woff2 b/public/fonts/roboto/roboto-v20-latin-500italic.woff2 new file mode 100644 index 0000000..0ff2f81 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-500italic.woff2 differ diff --git a/public/fonts/roboto/roboto-v20-latin-700.eot b/public/fonts/roboto/roboto-v20-latin-700.eot new file mode 100644 index 0000000..0168f09 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-700.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-700.svg b/public/fonts/roboto/roboto-v20-latin-700.svg new file mode 100644 index 0000000..11db87d --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-700.svg @@ -0,0 +1,309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-700.ttf b/public/fonts/roboto/roboto-v20-latin-700.ttf new file mode 100644 index 0000000..ea06a63 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-700.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-700.woff b/public/fonts/roboto/roboto-v20-latin-700.woff new file mode 100644 index 0000000..0f14eff Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-700.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-700.woff2 b/public/fonts/roboto/roboto-v20-latin-700.woff2 new file mode 100644 index 0000000..32b25ee Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-700.woff2 differ diff --git a/public/fonts/roboto/roboto-v20-latin-700italic.eot b/public/fonts/roboto/roboto-v20-latin-700italic.eot new file mode 100644 index 0000000..4eef294 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-700italic.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-700italic.svg b/public/fonts/roboto/roboto-v20-latin-700italic.svg new file mode 100644 index 0000000..050bee0 --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-700italic.svg @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-700italic.ttf b/public/fonts/roboto/roboto-v20-latin-700italic.ttf new file mode 100644 index 0000000..a0c3724 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-700italic.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-700italic.woff b/public/fonts/roboto/roboto-v20-latin-700italic.woff new file mode 100644 index 0000000..85ec258 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-700italic.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-700italic.woff2 b/public/fonts/roboto/roboto-v20-latin-700italic.woff2 new file mode 100644 index 0000000..fe58be2 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-700italic.woff2 differ diff --git a/public/fonts/roboto/roboto-v20-latin-900.eot b/public/fonts/roboto/roboto-v20-latin-900.eot new file mode 100644 index 0000000..0f81897 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-900.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-900.svg b/public/fonts/roboto/roboto-v20-latin-900.svg new file mode 100644 index 0000000..9efdf4e --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-900.svg @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-900.ttf b/public/fonts/roboto/roboto-v20-latin-900.ttf new file mode 100644 index 0000000..0efba53 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-900.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-900.woff b/public/fonts/roboto/roboto-v20-latin-900.woff new file mode 100644 index 0000000..4d50531 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-900.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-900.woff2 b/public/fonts/roboto/roboto-v20-latin-900.woff2 new file mode 100644 index 0000000..802499d Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-900.woff2 differ diff --git a/public/fonts/roboto/roboto-v20-latin-italic.eot b/public/fonts/roboto/roboto-v20-latin-italic.eot new file mode 100644 index 0000000..0753b88 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-italic.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-italic.svg b/public/fonts/roboto/roboto-v20-latin-italic.svg new file mode 100644 index 0000000..4d59797 --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-italic.svg @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-italic.ttf b/public/fonts/roboto/roboto-v20-latin-italic.ttf new file mode 100644 index 0000000..bdbb108 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-italic.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-italic.woff b/public/fonts/roboto/roboto-v20-latin-italic.woff new file mode 100644 index 0000000..b940dbc Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-italic.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-italic.woff2 b/public/fonts/roboto/roboto-v20-latin-italic.woff2 new file mode 100644 index 0000000..2741d4f Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-italic.woff2 differ diff --git a/public/fonts/roboto/roboto-v20-latin-regular.eot b/public/fonts/roboto/roboto-v20-latin-regular.eot new file mode 100644 index 0000000..4f34800 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-regular.eot differ diff --git a/public/fonts/roboto/roboto-v20-latin-regular.svg b/public/fonts/roboto/roboto-v20-latin-regular.svg new file mode 100644 index 0000000..627f5a3 --- /dev/null +++ b/public/fonts/roboto/roboto-v20-latin-regular.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto/roboto-v20-latin-regular.ttf b/public/fonts/roboto/roboto-v20-latin-regular.ttf new file mode 100644 index 0000000..a97385d Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-regular.ttf differ diff --git a/public/fonts/roboto/roboto-v20-latin-regular.woff b/public/fonts/roboto/roboto-v20-latin-regular.woff new file mode 100644 index 0000000..69c8825 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-regular.woff differ diff --git a/public/fonts/roboto/roboto-v20-latin-regular.woff2 b/public/fonts/roboto/roboto-v20-latin-regular.woff2 new file mode 100644 index 0000000..1a53701 Binary files /dev/null and b/public/fonts/roboto/roboto-v20-latin-regular.woff2 differ diff --git a/resources/lang/de Kopie.json b/resources/lang/de Kopie.json deleted file mode 100755 index cc18fd8..0000000 --- a/resources/lang/de Kopie.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "MR": "Herr", - "MS": "Frau", - "please select": "Bitte wählen", - "further countries": "weitere Länder", - "no": "Keine", - "Company data": "Firmendaten", - "Company name": "Firmenname", - "Street": "Straße", - "House number": "Hausnummer", - "City": "Ort", - "Postcode": "PLZ", - "Country": "Land", - "Phone": "Telefon", - "Homepage": "Homepage", - "Industry": "Branche", - "Industries": "Branchen", - "Main Industry": "Hauptbranche", - "Personal Data": "Ihre Daten", - "Function": "Funktion", - "Salutation": "Anrede", - "Title": "Titel", - "First name": "Vorname", - "Last Name": "Nachname", - "Mobile Phone": "Mobiltelefon", - "Your interests": "Ihre Interessen", - "Your contact person": "Ihr Ansprechpartner", - "Name": "Name", - "Consent & Privacy": "Einwilligung & Datenschutz", - "New Password": "Neues Passwort", - "Old Password": "Altes Passwort", - "Change Password": "Passwort ändern", - "Confirm new Password": "Neues Passwort wiederholen", - "Confirm Password": "Passwort bestätigen", - "Confirm E-Mail": "E-Mail wiederholen", - "E-Mail Address": "E-Mail Adresse", - "Forgot your Password?": "Passwort vergessen?", - "Login": "Einloggen", - "Logout": "Ausloggen", - "Password": "Passwort", - "Register": "Registrieren", - "Remember Me": "Angemeldet bleiben", - "Reset Password": "Passwort zurücksetzen", - "Send Password Reset Link": "Link zum Zurücksetzen des Passworts senden", - "save": "speichern", - "save changes": "Änderungen speichern", - "abort": "abbrechen", - "This field is required.": "Dieses Feld ist ein Pflichtfeld.", - "Please enter a valid email address.": "Bitte geben Sie eine gültige E-Mail-Adresse ein.", - "This E-mail is already in use.": "Diese E-Mail wird bereits verwendet.", - "Please enter the same value again.": "Die E-Mail Adressen sind nicht gleich.", - "a valid e-mail address": "Geben Sie bitte eine gültige E-Mail-Adresse ein.", - "Already have an account?": "Sie haben schon einen Account?", - "Login to your account": "Melden Sie sich in Ihrem Account an", - "Dont have an account yet?": "Sie haben noch keinen Account?", - "We keep you up to date on product news": "Gerne informieren wir Sie über Produktneuheiten, Relevantes aus der Branche und Beispiele zu unseren Anwendungen: ", - "Registration": "Registrierung", - "that’s how it’s done": "so geht’s", - "Just register": "Einfach registrieren", - "Just fill out the fields": " Füllen Sie einfach die Felder in der Eingabemaske aus. Danach erhalten Sie von uns per E-Mail einen Link. Mit einen Klick auf den Link bestätigen Sie die Registrierung.", - "Changeable at any time": "Jederzeit änderbar", - "With your e-mail address and password": " Mit Ihrer E-Mailadresse und Ihrem Passwort können Sie jederzeit Ihre Daten einsehen oder ändern.", - "Absolutely safe": "Absolut sicher", - "Your data will be stored on": "Ihre Daten werden auf deutschen Servern unter Berücksichtigung aktueller Sicherheitsstandards gespeichert.", - "now register data": "jetzt Daten registieren", - "Required fields": "Pflichtfelder", - "You will receive an e-mail for confirmation": "Sie erhalten eine E-Mail zur Bestätigung, über den Link in der E-Mail schalten Sie Ihren Daten frei.", - "Industry sectors": "Branchen", - "Interests": "Interessen", - "Leads": "Kontakte", - "Your Data": "Ihre Daten", - "Change password": "Passwort ändern", - "Edit your data": "Ihre Daten bearbeiten", - "I have read the :link and accept it.*": "Ich habe die :link gelesen und akzeptiere diese.*", - "data protection": "Datenschutzerklärung", - "Yes, I agree that will send me more information.": "Ja, ich bin damit einverstanden, dass mir weitere Informationen zusendet werden. Die Einwilligung ist jederzeit über diese Webseite widerrufbar.", - "saved": "Gespeichert", - "The changes have been saved.": "Die Änderungen wurden gespeichert.", - "error": "Fehler", - "Delete Account": "Account löschen", - "account deleted": "Account gelöschen", - "Here you can adjust your data.": "Hier können Sie Ihre Daten anpassen.", - "Overview": "Übersicht", - "Adjust data": "Daten anpassen", - "Login & Security": "Anmeldung & Sicherheit", - "Sign in with your e-mail:": "Anmeldung mit Ihrer E-Mail:", - "Change your password here to access your account.": "Ändern Sie hier Ihr Passwort für den Zugriff auf Ihren Account.", - "Activities": "Aktivitäten", - "Delete": "Löschen", - "If you no longer want to use our offer, you can delete your account here.": "Wenn Sie unser Angebot nicht mehr nutzen möchten, können Sie hier Ihren Account löschen.", - "Confirm your identity with your password before proceeding.": "Bestätigen Sie mit Ihrem Passwort Ihre Identität, bevor Sie fortfahren.", - "Dear Mrs": "Sehr geehrte Frau", - "Dear Sir": "Sehr geehrter Herr", - "Dear customer": "Sehr geehrter Kunde", - "Dear Customer you will receive this e-mail because we have received a request to reset the password for your account.": "Sie erhalten diese E-Mail, weil wir eine Anfrage zum Zurücksetzen des Passworts für Ihren Account erhalten haben.", - "Or copy this link into the address bar of your browser.": "Oder kopieren Sie diesen Link in die Adressleiste Ihres Browsers.", - "Best regards": "Mit freundlichen Grüßen", - "imprint": "Impressum", - "data protections": "Datenschutz", - "E-Mail address can not be changed!": "E-Mail Adresse ist nicht änderbar!", - "E-Mail address can not be changed here!": "E-Mail Adresse kann hier nicht geändert werden!", - "Thank you for your registration!": "Vielen Dank für Ihre Registrierung!", - "We have sent you an e-mail with a link to activate your data.": "Wir haben Ihnen eine E-Mail mit einem Link zur Freischaltung Ihrer Daten geschickt.", - "back to the homepage": "zurück zur Startseite", - "Verify Your Email Address": "Bestätigen Sie Ihre E-Mail-Adresse", - "Thank you for creating an account. Please follow the link below to confirm your email address.": "Vielen Dank für die Erstellung eines Accounts. Bitte folgen Sie dem unten stehenden Link, um Ihre E-Mail-Adresse zu bestätigen.", - "You have successfully verified your account!": "Sie haben Ihr Konto erfolgreich verifiziert!", - "Now check your data and release the data.": "Überprüfen Sie jetzt Ihre Daten und geben Sie die Daten frei.", - "Check and release data": "Daten überprüfen und freigeben", - "Check data": "Daten überprüfen", - "Page not available": "Seite nicht verfügbar", - "Data released": "Daten freigeben", - "Data released now": "Daten jetzt freigeben", - "E-Mail verified": "E-Mail verifiziert", - "Privacy policy approved": "Datenschutzerklärung zugestimmt", - "Consent for further information": "Einwilligung für weitere Informationen", - "at": "am", - "Assign a password for your account.": "Vergeben Sie ein Passwort für Ihren Account.", - "Create Password": "Passwort erstellen", - "back": "zurück", - "If you have checked your data, share your data here!": "Wenn Sie Ihre Daten überprüft haben, geben Sie Ihre Daten hier frei!", - "Contacts all": "gesamte Kontakte", - "Contacts verify": "Kontakte verifiziert", - "Contacts active": "Kontakte freigeschaltet", - "We have data about you stored in our System. Please follow the link below to verify your email address.You can also change or delete your data.": "Wir haben Daten über Sie in unserem System gespeichert. Bitte folgen Sie dem unten stehenden Link um Ihre E-Mail-Adresse zu bestätigen. Weitherhin können Sie Ihre Daten ändern oder auch löschen.", - "Verify your Data and E-Mail Address": "Bestätigen Sie Ihre Daten und E-Mail-Adresse", - "This website uses cookies in order to guarantee the best possible service. With your visit to this site you agree to our use of cookies.": "Diese Webseite verwendet Cookies, um Ihnen den bestmöglichen Service zu gewährleisten. Mit Ihrem Besuch auf dieser Seite stimmen Sie der Verwendung von Cookies zu.", - "OK": "OK", - "Contacts": "Kontake", - "active": "aktiviert", - "verified": "verifiziert", - "'E-Mail": "'E-Mail", - "create new Contact": "Neuen Kontakt erstellen", - "Create/Edit Contact": "Kontakt bearbeiten/erstellen", - "Pos": "Pos", - "Description": "Bezeichnung", - "Translate": "Übersetzung", - "Status": "Status", - "create/edit": "erstellen/bearbeiten", - "when active, the interest in the selection is displayed": "wenn aktiv, wird das Interesse in der Aushwahl angezeigt", - "close": "schließen", - "Number to move the position if necessary": "Zahl um ggf. die Postion zu verschieben", - "Create new interest": "Neues Interesse erstellen", - "Really delete entry?": "Eintrag wirklich löschen?", - "Create a new industry": "Neue Branche erstellen", - "Your e-mail has been changed.": "Ihre E-Mail wurde geändert.", - "We sent you an activation code. Check your email!": "Wir haben Ihnen einen Aktivierungscode gesendet. Überprüfen Sie Ihre E-Mails!", - "An activation code was sent to the account by e-mail!": "An den Kontkat wurde per E-Mail ein Aktivierungscode gesendet!", - "New E-Mail Address": "Neue E-Mail Adresse", - "Confirm new E-Mail": "Neue E-Mail Adresse wiederholen", - "Change E-Mail": "E-Mail Adresse ändern", - "Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.": "Ändern Sie hier Ihre E-Mail-Adresse. Wir senden Ihnen einen neuen Aktivierungslink an Ihre neue E-Mail-Adresse, um diese zu verifizieren.", - "Change the e-mail address of the contact here. We will send the contact a new activation link to the new e-mail address to verify it.": "Ändern Sie hier die E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.", - "Dear Customer you will receive this e-mail because we have received a request to change your E-Mail Address for your account.": "Sie erhalten diese E-Mail, weil wir eine Anfrage zur Änderung Ihrer E-Mail-Adresse für Ihr Konto erhalten haben.", - "business":"geschäftlich", - "private":"privat", - "business or private": "geschäftlich oder privat", - "use":"Nutzung", - "Country code":"Ländervorwahl", - "Contact":"Kontakt", - "waiting for activation since":"wartet auf Aktivierung seit", - "": "" -} \ No newline at end of file diff --git a/resources/lang/de/email.php b/resources/lang/de/email.php index 4bf2ad7..9f90ffe 100644 --- a/resources/lang/de/email.php +++ b/resources/lang/de/email.php @@ -15,6 +15,7 @@ 'your_request_from' => 'Deine Anfrage von', 'checkout_subject' => 'Deine Bestellung bei', 'checkout_subject_paid' => 'Zahlungsbestätigung - Deine Bestellung bei', + 'checkout_subject_extern' => 'Neue Bestellung', 'change_e_mail' => 'E-Mail Adresse ändern', 'salutation' => 'Anrede', 'first_name' => 'Vorname', @@ -38,10 +39,11 @@ 'email_verify_copy1line' => 'Vielen Dank für Deine Registrierung. Bitte folge dem unten stehenden Link, um Deine E-Mail-Adresse zu bestätigen.', 'copy_to_browser' => 'Oder kopiere diesen Link in die Adressleiste Deines Browsers.', 'activate_copy' => 'Bitte bestätige Deine E-Mail und aktiviere Deinen Account über diesen Link:', - 'account_active_copy1line' => 'Dein Account wurde nach erfolgreicher Prüfung freigeschaltet. Deinen Beratervertag findest du auf der Startseite im Loginbereich von my.mivita.care. Melde dich mit deinen Benutzerdaten an, um weitere Schritte zu unternehmen.', + 'account_active_copy1line' => 'Dein Account wurde nach erfolgreicher Prüfung freigeschaltet. Deinen Beratervertag findest Du auf der Startseite im Loginbereich von my.mivita.care. Melde dich mit deinen Benutzerdaten an, um weitere Schritte zu unternehmen.', 'reset_pass_copy1line' => 'Du erhälst diese E-Mail, weil wir eine Anfrage zum Zurücksetzen Deines Passworts für Dein Konto erhalten haben.', 'checkout_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend haben wir zur Kontrolle Deine Bestellung noch einmal aufgelistet.', 'checkout_copy3line' => 'Bei Fragen sind wir jederzeit für Dich da.', + 'checkout_copy3line_extern' => 'Bestellung über Berater:', 'status_copy1line' => 'Status zu Deiner Bestellung auf mivita.care', 'footer_copy1' => 'mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach | Telefon: +49 (0) 8333 946 98 90 | Fax: +49 (0) 8333 7268 E-Mail: info@mivita.care', 'footer_copy2' => 'Geschäftsinhaber: Alois Ried | Registergericht: Memmingen | Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340', @@ -60,9 +62,10 @@ '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_deliver_customer' => 'Lieferadresse des Kunden:', 'checkout_mail_order_for_me' => 'Beraterbestellung für Dich:', 'checkout_mail_order_for_ot' => 'Beraterbestellung für Deinen Kunden:', + 'checkout_mail_order_for_extern' => 'Kundenbestellung über externen Shop:', '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', diff --git a/resources/lang/de/register.php b/resources/lang/de/register.php index 2f507ed..4afec0d 100644 --- a/resources/lang/de/register.php +++ b/resources/lang/de/register.php @@ -6,7 +6,7 @@ return [ 'reg_hl' => 'Registrierung', 'reg_line_1' => 'Dieses Formular ist für die Registrierung neuer Vertriebspartner. Nach dem Absenden des Formulars erhälst du eine E Mail mit weiteren Informationen sowie den Freischaltlink.', 'reg_checked' => 'Hiermit willige ich in die im Rahmen der Datenschutzerklärung genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann', - 'reg_finisch_hl' => 'Vielen Dank für Ihre Registrierung!', + 'reg_finisch_hl' => 'Vielen Dank für Deine Registrierung!', 'reg_finisch_line_1' => 'Wir haben Dir eine E-Mail mit einem Link zur Freischaltung Deines Accounts gesendet.', 'reg_finisch_line_2' => 'Bitte rufe Deine E-Mails ab und bestätige den Link.', 'wizard_verification_hl' => 'Verifizierung (Personalausweis oder Pass; PDF, JPG, PNG)', @@ -18,7 +18,7 @@ return [ 'wizard_create_release_hl' => 'Vielen Dank', 'wizard_create_release_line_1' => 'Deine Registrierung und Buchung der Mitgliedschaft ist abgeschlossen!
Sobald die Zahlung bei uns eingegangen ist, erhälst Du automatisch eine E-Mail und Deine Mitgliedschaft wird automatisch freigeschaltet.', 'wizard_reg_release_hl' => 'Wartet auf Überprüfung', - 'wizard_reg_release_line_1' => 'Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.
Nach erfolgreicher Prüfung wird dein Account freigeschaltet und Du erhälst Du eine E-Mail.', + 'wizard_reg_release_line_1' => 'Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.
Nach erfolgreicher Prüfung wird Dein Account freigeschaltet und Du erhälst eine E-Mail.', 'sender' => 'Dein Team von mivita.care', 'required_fields' => 'Pflichtfelder', 'business_license_now' => 'Gewerbeschein jetzt hochladen', diff --git a/resources/views/admin/product/index.blade.php b/resources/views/admin/product/index.blade.php index 19a2668..008e975 100755 --- a/resources/views/admin/product/index.blade.php +++ b/resources/views/admin/product/index.blade.php @@ -20,8 +20,8 @@ {{__('Name')}} {{__('Artikelnummer')}} {{__('Kategorie')}} - {{__('Points')}} {{__('Preis')}} + {{__('Points')}} {{__('Inhalt')}} {{__('Einheit')}} {{__('Grundpreis')}} diff --git a/resources/views/admin/sales/_detail.blade.php b/resources/views/admin/sales/_detail.blade.php index 2053b5f..b51d5f3 100644 --- a/resources/views/admin/sales/_detail.blade.php +++ b/resources/views/admin/sales/_detail.blade.php @@ -118,8 +118,9 @@
+
- @if($shopping_order->shopping_user->is_from === 'shopping') + @if($shopping_order->shopping_user->is_from === 'shopping' || $shopping_order->shopping_user->is_from === 'extern') Rechnungsadresse des Kunden @else Rechnungsadresse des Beraters @@ -185,7 +186,7 @@
- @if($shopping_order->shopping_user->is_from === 'user_order') + @if($shopping_order->shopping_user->is_from === 'user_order' || $shopping_order->shopping_user->is_from === 'extern') @if($shopping_order->shopping_user->is_for === 'me') Lieferadresse des Berater @else @@ -319,21 +320,23 @@
- @if($shopping_order_item->product->images) - @if($image = $shopping_order_item->product->images->first()) - + @if($shopping_order_item->product) + @if($shopping_order_item->product->images) + @if($image = $shopping_order_item->product->images->first()) + + @endif @endif - @endif -
- {{ $shopping_order_item->product->name }} - #{{ $shopping_order_item->product->number }} - - Inhalt: {{ $shopping_order_item->product->contents }}
- Gewicht: {{ $shopping_order_item->product->weight }} g
- Points: {{ $shopping_order_item->product->points }} - -
+
+ {{ $shopping_order_item->product->name }} + #{{ $shopping_order_item->product->number }} + + Inhalt: {{ $shopping_order_item->product->contents }}
+ Gewicht: {{ $shopping_order_item->product->weight }} g
+ Points: {{ $shopping_order_item->product->points }} + +
+ @endif
@@ -504,13 +507,40 @@
+ @if($shopping_order->txaction === 'extern') +
+ @if($shopping_order->wp_invoice_path) +
+
+ Link zur Rechnung +
+
+ @endif + @if($shopping_order->wp_notice['wp_advertising']) +
+
+ Werbemittel: {!! $shopping_order->wp_notice['wp_advertising'] !!}
 +
+
+ @endif + @if($shopping_order->wp_notice['wp_incentives']) +
+
+ Incentives: {!! $shopping_order->wp_notice['wp_incentives'] !!}
 +
+
+ @endif +
+
+ @endif +
Zahlung
+ @if($shopping_order->txaction !== 'extern')
- @@ -578,6 +608,17 @@
+ @else +
+
+
+
    +
  • Bestellung über externen SHOP
    • +
+
+
+
+ @endif
diff --git a/resources/views/emails/checkout.blade.php b/resources/views/emails/checkout.blade.php index fa3b5b9..184aa35 100644 --- a/resources/views/emails/checkout.blade.php +++ b/resources/views/emails/checkout.blade.php @@ -128,7 +128,7 @@ - @if($mode === 'test') + @if($mode === 'test' || $mode === 'dev')
##### TEST MODE ##### TEST MODE ##### TEST MODE ##### @@ -169,13 +169,14 @@ {{ __('navigation.my_homeparty') }} / {{ $shopping_order->homeparty->name }} - {{ $shopping_order->homeparty->date }}
{{__('email.checkout_mail_hl1')}} @endif + @if($shopping_order->shopping_user->is_from === 'extern') + {{__('email.checkout_mail_order_for_extern')}} + @endif
@if($shopping_order->shopping_user->is_from === 'homeparty') - - @php($homeparty = $shopping_order->homeparty) @if($homeparty->homeparty_host)

Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}

@@ -191,7 +192,6 @@ @endforeach @endif
- @include('emails.homeparty_detail_total', ['homeparty' => $homeparty]) @else @@ -290,190 +290,311 @@
- @if($send_link) - -
-
- - + @if($shopping_order->shopping_user->is_from !== 'extern') + + @if($send_link) + + + + + + + @endif + + + + + - - - - - @endif - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - + + + @endif + + + + + + + + + + + + + + + + + + @endif +
+
+ + + + + + +
+ + + + + + + + + +
+

+ {{ $button }} +

+
+ {{ $url }} +
+
+
+
+
+
+ {{__('email.checkout_mail_pay_info')}} +
+ - -
- - - - - - - - - -
-

- {{ $button }} -

-
- {{ $url }} -
+ 		+ {{__('email.checkout_mail_pay_success')}}
+ {{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}
+ {{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}
+ {{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}
- -
-
-
- {{__('email.checkout_mail_pay_info')}} -
- - - - -
- {{__('email.checkout_mail_pay_success')}}
- {{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}
- {{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}
- {{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}
-
-
-
-
- {{__('email.checkout_mail_invoice_addess')}} -
+
+
+
+ {{__('email.checkout_mail_invoice_addess')}} +
- - - - -
- @if($shopping_order->shopping_user->billing_company) - {{ $shopping_order->shopping_user->billing_company }}
- @endif - - {{ $shopping_order->shopping_user->billing_firstname }} - {{ $shopping_order->shopping_user->billing_lastname }}
-
- - {{ $shopping_order->shopping_user->billing_address }}
- @if($shopping_order->shopping_user->billing_address_2) - {{ $shopping_order->shopping_user->billing_address_2 }}
- @endif - - {{ $shopping_order->shopping_user->billing_zipcode }} - {{ $shopping_order->shopping_user->billing_city }}
- {{ $shopping_order->shopping_user->billing_country->getLocated() }}
- - @if($shopping_order->shopping_user->billing_phone) -

{{ $shopping_order->shopping_user->billing_phone }}
- @endif -
-
- @if($shopping_order->shopping_user->is_from === 'user_order') - @if($shopping_order->shopping_user->is_for === 'me') - {{__('email.checkout_mail_deliver_addess')}} - @else - {{__('email.checkout_mail_deliver_customer')}} - @endif - @else - {{__('email.checkout_mail_deliver_addess')}} - @endif -
- - - - - - - - - + + + - + @else + {{__('email.checkout_mail_deliver_addess')}} + @endif + + + + + + + + + + + + @else + @if($shopping_order->wp_invoice_path) + + + + @endif + @if($shopping_order->wp_notice['wp_advertising']) + + + + @endif + @if($shopping_order->wp_notice['wp_incentives']) - - -
- @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 }}
+ + + - - -
+ @if($shopping_order->shopping_user->billing_company) + {{ $shopping_order->shopping_user->billing_company }}
@endif - {{ $shopping_order->shopping_user->shipping_firstname }} - {{ $shopping_order->shopping_user->shipping_lastname }}
+ {{ $shopping_order->shopping_user->billing_firstname }} + {{ $shopping_order->shopping_user->billing_lastname }}

- {{ $shopping_order->shopping_user->shipping_address }}
- @if($shopping_order->shopping_user->shipping_address_2) - {{ $shopping_order->shopping_user->shipping_address_2 }}
+ {{ $shopping_order->shopping_user->billing_address }}
+ @if($shopping_order->shopping_user->billing_address_2) + {{ $shopping_order->shopping_user->billing_address_2 }}
@endif - {{ $shopping_order->shopping_user->shipping_zipcode }} - {{ $shopping_order->shopping_user->shipping_city }}
+ {{ $shopping_order->shopping_user->billing_zipcode }} + {{ $shopping_order->shopping_user->billing_city }}
+ {{ $shopping_order->shopping_user->billing_country->getLocated() }}
- {{ $shopping_order->shopping_user->shipping_country->getLocated() }}
- - @if($shopping_order->shopping_user->shipping_phone) -

{{ $shopping_order->shopping_user->shipping_phone }}
+ @if($shopping_order->shopping_user->billing_phone) +

{{ $shopping_order->shopping_user->billing_phone }}
@endif - @endif -
-
-
-
- - - + +
- {{ $copy3line }} -
- @if($shopping_order->member) - @if($shopping_order->member->shop && $shopping_order->member->isActiveShop()) - @if($shopping_order->member->shop->title) - {{ $shopping_order->member->shop->title }}
- @endif - @if($shopping_order->member->shop->contact) - {!! nl2br($shopping_order->member->shop->contact) !!}
- @endif - {{ $shopping_order->member->shop->getSubdomain(true) }} - @else - Dein Berater: {{$shopping_order->member->getFullName()}} - @endif +
+
+ @if($shopping_order->shopping_user->is_from === 'user_order') + @if($shopping_order->shopping_user->is_for === 'me') + {{__('email.checkout_mail_deliver_addess')}} + @else + {{__('email.checkout_mail_deliver_customer')}} @endif -

- {{ $greetings }}
{{ $sender }} -
-
+ + + + + +
+ @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 }}
+ @endif + + {{ $shopping_order->shopping_user->shipping_firstname }} + {{ $shopping_order->shopping_user->shipping_lastname }}
+
+ + {{ $shopping_order->shopping_user->shipping_address }}
+ @if($shopping_order->shopping_user->shipping_address_2) + {{ $shopping_order->shopping_user->shipping_address_2 }}
+ @endif + + {{ $shopping_order->shopping_user->shipping_zipcode }} + {{ $shopping_order->shopping_user->shipping_city }}
+ + {{ $shopping_order->shopping_user->shipping_country->getLocated() }}
+ + @if($shopping_order->shopping_user->shipping_phone) +

{{ $shopping_order->shopping_user->shipping_phone }}
+ @endif + @endif +
+
+
+
+ + + + + + + +
+ {{ $copy3line }} +
+ @if($shopping_order->member) + @if($shopping_order->member->shop && $shopping_order->member->isActiveShop()) + @if($shopping_order->member->shop->title) + {{ $shopping_order->member->shop->title }}
+ @endif + @if($shopping_order->member->shop->contact) + {!! nl2br($shopping_order->member->shop->contact) !!}
+ @endif + {{ $shopping_order->member->shop->getSubdomain(true) }} + @else + Dein Berater: {{$shopping_order->member->getFullName()}} + @endif + @endif +

+ {{ $greetings }}
{{ $sender }} +
+

+
+ Rechnung: {{$shopping_order->wp_invoice_path}}
+
+
+ Werbemittel: {!! $shopping_order->wp_notice['wp_advertising'] !!}
 +
+

-
+ Incentives: {!! $shopping_order->wp_notice['wp_incentives'] !!}
 +
+
+ {{__('email.checkout_mail_deliver_customer')}} +
+ + + + +
+ @if($shopping_order->shopping_user->same_as_billing) + @if($shopping_order->shopping_user->billing_company) + {{ $shopping_order->shopping_user->billing_company }}
+ @endif + + {{ $shopping_order->shopping_user->billing_firstname }} + {{ $shopping_order->shopping_user->billing_lastname }}
+
+ + {{ $shopping_order->shopping_user->billing_address }}
+ @if($shopping_order->shopping_user->billing_address_2) + {{ $shopping_order->shopping_user->billing_address_2 }}
+ @endif + + {{ $shopping_order->shopping_user->billing_zipcode }} + {{ $shopping_order->shopping_user->billing_city }}
+ {{ $shopping_order->shopping_user->billing_country->getLocated() }}
+ + @if($shopping_order->shopping_user->billing_phone) +

{{ $shopping_order->shopping_user->billing_phone }}
+ @endif + @else + @if($shopping_order->shopping_user->shipping_company) + {{ $shopping_order->shopping_user->shipping_company }}
+ @endif + + {{ $shopping_order->shopping_user->shipping_firstname }} + {{ $shopping_order->shopping_user->shipping_lastname }}
+
+ + {{ $shopping_order->shopping_user->shipping_address }}
+ @if($shopping_order->shopping_user->shipping_address_2) + {{ $shopping_order->shopping_user->shipping_address_2 }}
+ @endif + + {{ $shopping_order->shopping_user->shipping_zipcode }} + {{ $shopping_order->shopping_user->shipping_city }}
+ + {{ $shopping_order->shopping_user->shipping_country->getLocated() }}
+ + @if($shopping_order->shopping_user->shipping_phone) +

{{ $shopping_order->shopping_user->shipping_phone }}
+ @endif + @endif +
+
+
+
+ {{__('email.checkout_copy3line_extern')}} +
+ + + + + + + +
+ + @if($shopping_order->member) + Berater: {{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->member->account->m_salutation) }} {{ $shopping_order->member->account->m_first_name }} {{ $shopping_order->member->account->m_last_name }} +
+ Account ID: {{ $shopping_order->member->account->m_account }}
+ @if($shopping_order->member->user_level) + Karriere-Level: {{ $shopping_order->member->user_level->name }}
+ @endif + @endif + +

+
{{ config('app.name') }} - - + diff --git a/resources/views/user/customer/detail.blade.php b/resources/views/user/customer/detail.blade.php index 714b0ab..9666939 100644 --- a/resources/views/user/customer/detail.blade.php +++ b/resources/views/user/customer/detail.blade.php @@ -7,8 +7,6 @@ {{ __('Kunden Details') }} - - @if(Session::has('custom-error'))
diff --git a/resources/views/user/shop/sales/order_detail.blade.php b/resources/views/user/shop/sales/order_detail.blade.php new file mode 100644 index 0000000..81c48fd --- /dev/null +++ b/resources/views/user/shop/sales/order_detail.blade.php @@ -0,0 +1,11 @@ +@extends('layouts.layout-2') + +@section('content') +

+ zurück + {{ __('Bestellung Kunde') }} #{{$shopping_order->id}} +

+ @include('admin.sales._detail') + zurück + +@endsection \ No newline at end of file diff --git a/resources/views/web/templates/registrierung.blade.php b/resources/views/web/templates/registrierung.blade.php index bc9d6cd..05b39f6 100644 --- a/resources/views/web/templates/registrierung.blade.php +++ b/resources/views/web/templates/registrierung.blade.php @@ -97,7 +97,7 @@
- {!! Form::label('first_name', __('Salutation').'*') !!} + {!! Form::label('salutation', __('Salutation').'*') !!} {!! Form::select('salutation', [''=>'Bitte wählen', 'mr'=>'Herr', 'ms'=>'Frau'], '', ['class' => 'form-control '.($errors->has('salutation') ? 'error is-invalid' : '')]) !!} @if ($errors->has('salutation'))
diff --git a/routes/api.php b/routes/api.php index 8c30385..e6b1f26 100755 --- a/routes/api.php +++ b/routes/api.php @@ -53,5 +53,7 @@ Route::group([ Route::post('order', 'Api\ShoppingUserController@order'); Route::post('status', 'Api\ShoppingUserController@status'); Route::post('delete', 'Api\ShoppingUserController@delete'); + Route::post('cancel', 'Api\ShoppingUserController@cancel'); + Route::post('open', 'Api\ShoppingUserController@open'); }); }); \ No newline at end of file