diff --git a/.env.dhl.example b/.env.dhl.example new file mode 100644 index 00000000..67d49c93 --- /dev/null +++ b/.env.dhl.example @@ -0,0 +1,74 @@ +# ============================================================================= +# DHL VERSANDMODUL KONFIGURATION - BEISPIEL +# ============================================================================= +# Diese Datei enthält alle DHL-spezifischen Environment-Variablen +# Kopieren Sie die benötigten Variablen in Ihre .env Datei + +# DHL API Zugangsdaten +# Option 1: DHL Developer API (developer.dhl.com) - Empfohlen +DHL_API_KEY=your_api_key_from_developer_dhl_com +DHL_API_SECRET=your_api_secret_from_developer_dhl_com + +# Option 2: DHL Business Customer API (Klassisch) +DHL_API_USERNAME=your_dhl_username +DHL_API_PASSWORD=your_dhl_password +DHL_ACCOUNT_NUMBER=your_14_digit_account_number + +# API-Konfiguration +DHL_SANDBOX=true # false für Produktion +DHL_TEST_MODE=true # false für Produktion +DHL_API_TYPE=developer # 'developer' oder 'business_customer' + +# Absenderadresse (Ihre Firmenadresse) +DHL_SENDER_COMPANY="Ihr Firmenname" +DHL_SENDER_NAME="Versandabteilung" +DHL_SENDER_STREET="Ihre Straße" +DHL_SENDER_STREET_NUMBER=123 +DHL_SENDER_POSTAL_CODE=12345 +DHL_SENDER_CITY="Ihre Stadt" +DHL_SENDER_STATE= +DHL_SENDER_COUNTRY=DE +DHL_SENDER_EMAIL=versand@ihrefirma.de +DHL_SENDER_PHONE="+49 123 456789" + +# Standard-Einstellungen +DHL_DEFAULT_PRODUCT=V01PAK # V01PAK = DHL Paket +DHL_LABEL_FORMAT=PDF # PDF oder ZPL +DHL_LABEL_SIZE=A4 # A4 oder 10x15cm +DHL_LABEL_STORAGE_PATH=storage/app/dhl/labels +DHL_LABEL_PUBLIC_PATH=dhl/labels + +# Retouren +DHL_RETURNS_ENABLED=true +DHL_RETURN_PRODUCT=V07PAK # V07PAK = DHL Paket Return +DHL_RETURN_RECEIVER_ID=your_return_receiver_id + +# Tracking +DHL_TRACKING_ENABLED=true +DHL_TRACKING_AUTO_UPDATE=true +DHL_TRACKING_UPDATE_INTERVAL=60 # Minuten + +# Logging +DHL_LOGGING_ENABLED=true +DHL_LOGGING_LEVEL=info # debug, info, warning, error +DHL_LOG_REQUESTS=true +DHL_LOG_RESPONSES=true + +# Queue (verwende bestehende Queue-Konfiguration) +DHL_QUEUE_CONNECTION=database +DHL_QUEUE_NAME=dhl +DHL_QUEUE_TIMEOUT=60 +DHL_QUEUE_MAX_TRIES=3 + +# Fehlerbehandlung +DHL_THROW_EXCEPTIONS=true +DHL_ERROR_NOTIFICATION_EMAIL=admin@ihrefirma.de + +# Cache +DHL_CACHE_ENABLED=true +DHL_CACHE_TTL=3600 # Sekunden + +# Entwicklung/Testing +DHL_FAKE_API_CALLS=false # true um API-Calls zu simulieren +DHL_MOCK_RESPONSES=false # true um Mock-Responses zu verwenden +DHL_DEBUG_MODE=false # true für detaillierte Debug-Informationen \ No newline at end of file diff --git a/.env.example b/.env.example new file mode 100644 index 00000000..67d49c93 --- /dev/null +++ b/.env.example @@ -0,0 +1,74 @@ +# ============================================================================= +# DHL VERSANDMODUL KONFIGURATION - BEISPIEL +# ============================================================================= +# Diese Datei enthält alle DHL-spezifischen Environment-Variablen +# Kopieren Sie die benötigten Variablen in Ihre .env Datei + +# DHL API Zugangsdaten +# Option 1: DHL Developer API (developer.dhl.com) - Empfohlen +DHL_API_KEY=your_api_key_from_developer_dhl_com +DHL_API_SECRET=your_api_secret_from_developer_dhl_com + +# Option 2: DHL Business Customer API (Klassisch) +DHL_API_USERNAME=your_dhl_username +DHL_API_PASSWORD=your_dhl_password +DHL_ACCOUNT_NUMBER=your_14_digit_account_number + +# API-Konfiguration +DHL_SANDBOX=true # false für Produktion +DHL_TEST_MODE=true # false für Produktion +DHL_API_TYPE=developer # 'developer' oder 'business_customer' + +# Absenderadresse (Ihre Firmenadresse) +DHL_SENDER_COMPANY="Ihr Firmenname" +DHL_SENDER_NAME="Versandabteilung" +DHL_SENDER_STREET="Ihre Straße" +DHL_SENDER_STREET_NUMBER=123 +DHL_SENDER_POSTAL_CODE=12345 +DHL_SENDER_CITY="Ihre Stadt" +DHL_SENDER_STATE= +DHL_SENDER_COUNTRY=DE +DHL_SENDER_EMAIL=versand@ihrefirma.de +DHL_SENDER_PHONE="+49 123 456789" + +# Standard-Einstellungen +DHL_DEFAULT_PRODUCT=V01PAK # V01PAK = DHL Paket +DHL_LABEL_FORMAT=PDF # PDF oder ZPL +DHL_LABEL_SIZE=A4 # A4 oder 10x15cm +DHL_LABEL_STORAGE_PATH=storage/app/dhl/labels +DHL_LABEL_PUBLIC_PATH=dhl/labels + +# Retouren +DHL_RETURNS_ENABLED=true +DHL_RETURN_PRODUCT=V07PAK # V07PAK = DHL Paket Return +DHL_RETURN_RECEIVER_ID=your_return_receiver_id + +# Tracking +DHL_TRACKING_ENABLED=true +DHL_TRACKING_AUTO_UPDATE=true +DHL_TRACKING_UPDATE_INTERVAL=60 # Minuten + +# Logging +DHL_LOGGING_ENABLED=true +DHL_LOGGING_LEVEL=info # debug, info, warning, error +DHL_LOG_REQUESTS=true +DHL_LOG_RESPONSES=true + +# Queue (verwende bestehende Queue-Konfiguration) +DHL_QUEUE_CONNECTION=database +DHL_QUEUE_NAME=dhl +DHL_QUEUE_TIMEOUT=60 +DHL_QUEUE_MAX_TRIES=3 + +# Fehlerbehandlung +DHL_THROW_EXCEPTIONS=true +DHL_ERROR_NOTIFICATION_EMAIL=admin@ihrefirma.de + +# Cache +DHL_CACHE_ENABLED=true +DHL_CACHE_TTL=3600 # Sekunden + +# Entwicklung/Testing +DHL_FAKE_API_CALLS=false # true um API-Calls zu simulieren +DHL_MOCK_RESPONSES=false # true um Mock-Responses zu verwenden +DHL_DEBUG_MODE=false # true für detaillierte Debug-Informationen \ No newline at end of file diff --git a/app/Console/Commands/CheckPaymentsAccount.php b/app/Console/Commands/CheckPaymentsAccount.php index 64ed689a..ebe38672 100644 --- a/app/Console/Commands/CheckPaymentsAccount.php +++ b/app/Console/Commands/CheckPaymentsAccount.php @@ -38,23 +38,23 @@ class CheckPaymentsAccount extends Command $this->info('COMMAND [payments:check-accounts] started.'); // Die Logik wurde 1:1 aus der checkPaymentsAccounts-Methode übernommen - $renewalDate = Carbon::now()->modify('+'.(config('mivita.remind_first_days')+1).' days'); + $renewalDate = Carbon::now()->modify('+' . (config('mivita.remind_first_days') + 1) . ' days'); Log::channel('cron')->info('Erneuerungsdatum für Zahlungen: ' . $renewalDate->format('Y-m-d H:i:s')); - + $users = User::where('payment_account', '!=', NULL) - ->where('active', '=', 1) - ->where('blocked', '!=', 1) - ->where('payment_account', '<', $renewalDate) - ->get(); + ->where('active', '=', 1) + ->where('blocked', '!=', 1) + ->where('payment_account', '<', $renewalDate) + ->get(); Log::channel('cron')->info('Found ' . $users->count() . ' users for payment reminders.'); $this->info('Found ' . $users->count() . ' users for payment reminders.'); - foreach ($users as $user){ - Log::channel('cron')->info('Prüfe Zahlungserinnerungen für Benutzer: ' . $user->email); - $this->checkReminderPayments($user); + foreach ($users as $user) { + Log::channel('cron')->info('Prüfe Zahlungserinnerungen für Benutzer: ' . $user->email); + $this->checkReminderPayments($user); } - + Log::channel('cron')->info('COMMAND [payments:check-accounts] finished.'); $this->info('COMMAND [payments:check-accounts] finished.'); return 0; // Success @@ -79,28 +79,28 @@ class CheckPaymentsAccount extends Command private function checkReminderPayments(User $user) { //35 reminder_deaktiv, 36 reminder_deaktiv_sepa - if(!$user->isActiveAccount()){ + if (!$user->isActiveAccount()) { Log::channel('cron')->info('Inaktives Konto für Benutzer: ' . $user->email); $this->checkIsReminderSend($user, 35); return; } //34 reminder_last - if($user->daysActiveAccount() <= config('mivita.remind_last_days')){ + if ($user->daysActiveAccount() <= config('mivita.remind_last_days')) { Log::channel('cron')->info('Letzte Erinnerung für Benutzer: ' . $user->email . ' (Tage aktiv: ' . $user->daysActiveAccount() . ')'); $this->checkIsReminderSend($user, 34); return; } //33 reminder_sec - if($user->daysActiveAccount() <= config('mivita.remind_sec_days')){ + if ($user->daysActiveAccount() <= config('mivita.remind_sec_days')) { Log::channel('cron')->info('Zweite Erinnerung für Benutzer: ' . $user->email . ' (Tage aktiv: ' . $user->daysActiveAccount() . ')'); $this->checkIsReminderSend($user, 33); return; } //31 reminder_first - if($user->daysActiveAccount() > config('mivita.remind_sec_days')){ + if ($user->daysActiveAccount() > config('mivita.remind_sec_days')) { Log::channel('cron')->info('Erste Erinnerung für Benutzer: ' . $user->email . ' (Tage aktiv: ' . $user->daysActiveAccount() . ')'); $this->checkIsReminderSend($user, 31); return; @@ -117,28 +117,28 @@ class CheckPaymentsAccount extends Command private function checkIsReminderSend(User $user, $status) { $isSend = UserHistory::whereUserId($user->id) - ->whereAction('reminder_payments') - ->whereIdentifier($user->payment_account) - ->whereStatus($status) - ->latest() - ->first(); + ->whereAction('reminder_payments') + ->whereIdentifier($user->payment_account) + ->whereStatus($status) + ->latest() + ->first(); - if($isSend){ + if ($isSend) { Log::channel('cron')->info('Erinnerung bereits gesendet für Benutzer: ' . $user->email . ' (Status: ' . $status . ')'); return true; } - + Log::channel('cron')->info('Sende neue Erinnerung für Benutzer: ' . $user->email . ' (Status: ' . $status . ')'); $referenz = $this->sendReminderMail($user, $status); - + UserHistory::create([ - 'user_id' => $user->id, - 'action' => 'reminder_payments', - 'referenz' => $referenz, - 'identifier' => $user->payment_account, + 'user_id' => $user->id, + 'action' => 'reminder_payments', + 'referenz' => $referenz, + 'identifier' => $user->payment_account, 'status' => $status ]); - + return false; } @@ -155,8 +155,8 @@ class CheckPaymentsAccount extends Command $pay_date = Carbon::parse($user->payment_account)->modify('- ' . config('mivita.abo_booking_days') . ' days')->format('d.m.Y'); $datetime = $user->getPaymentAccountDateFormat(); $price = ""; - - if($user->payment_order_id && isset($user->payment_order_product->price)){ + + if ($user->payment_order_id && isset($user->payment_order_product->price)) { $price = 'von ' . $user->payment_order_product->getFormattedPrice() . ' EUR'; } @@ -171,16 +171,16 @@ class CheckPaymentsAccount extends Command 'subject' => __('reminder.subject') . " | ID: " . $status, 'message' => $message, 'message_last' => $message_last, - 'url' => route('user_membership'), + 'url' => config('app.url') . '/user/membership', 'button' => $button, ]; - + $sender = User::find(1); $customer_mail = UserMessage::create(['user_id' => $user->id, 'send_user_id' => $sender->id, 'email' => $user->email, 'subject' => $data['subject'], 'message' => $data['message'] . " " . $data['message_last']]); - + try { - if(!Util::isTestSystem()){ - if($status >= 34){ + if (!Util::isTestSystem()) { + if ($status >= 34) { Log::channel('cron')->info('Sende kritische Erinnerung mit BCC an: ' . $user->email); Mail::to($user->email) ->locale($user->getLocale()) @@ -195,19 +195,19 @@ class CheckPaymentsAccount extends Command } else { Log::channel('cron')->info('Testsystem: E-Mail-Versand simuliert für: ' . $user->email); } - } catch(\Exception $e) { + } catch (\Exception $e) { Log::channel('cron')->error('Mail-Fehler für Benutzer ' . $user->email . ': ' . $e->getMessage()); $customer_mail->fail = true; $customer_mail->error = $e->getMessage(); $customer_mail->save(); return 0; } - + $customer_mail->send = true; $customer_mail->sent_at = now(); $customer_mail->save(); - + Log::channel('cron')->info('Erinnerungsmail erfolgreich gesendet an: ' . $user->email); return 1; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Web/CheckoutController.php b/app/Http/Controllers/Web/CheckoutController.php index 92df33ed..10343b28 100755 --- a/app/Http/Controllers/Web/CheckoutController.php +++ b/app/Http/Controllers/Web/CheckoutController.php @@ -25,7 +25,7 @@ class CheckoutController extends Controller { private $checkoutRepo; private $instance = 'checkout'; - + /** * Create a new controller instance. * @@ -50,7 +50,7 @@ class CheckoutController extends Controller {{ __('website.to_customer_portal') }} @endif @if(Auth::guard('user')->check()) - */ + */ $shopping_data = Yard::instance($this->instance)->getYardExtra('shopping_data'); $is_from = $shopping_data['is_from'] ?? 'shopping'; $is_for = $shopping_data['is_for'] ?? false; @@ -70,14 +70,17 @@ class CheckoutController extends Controller } } if (Session::has('new_session')) { - $this->checkoutRepo->sessionDestroy(); + $this->checkoutRepo->sessionDestroy(); Session::forget('new_session'); - } + } $shopping_user = $this->initializeShoppingUserSession($is_from, $is_for, $shopping_data, $homeparty_id); - + $this->prepareShoppingUserData($shopping_user); $payment_methods = $this->checkoutRepo->getPaymentsMethods($is_from, $is_abo); - + + if ($shopping_user === null) { + abort(403, 'ShoppingUser not found'); + } $data = [ 'is_from' => $is_from, 'is_for' => $is_for, @@ -97,8 +100,8 @@ class CheckoutController extends Controller return view('web.templates.checkout', $data); } - - + + /** * Bereitet die ShoppingUser-Daten vor * @@ -142,7 +145,7 @@ class CheckoutController extends Controller if (isset($data['payment_method'])) { $this->checkoutRepo->isPaymentsMethodsActive($data['payment_method'], $data['is_from'], $data['is_abo']); } - + Util::setInstanceStatus(2, true); // link_check // Länderwechsel verarbeiten @@ -155,16 +158,16 @@ class CheckoutController extends Controller if ($validator->fails()) { return back()->withErrors($validator)->withInput(Request::all()); } - + // Benutzer und Bestellung erstellen $shopping_user = $this->checkoutRepo->makeShoppingUser($data); $shopping_order = $this->checkoutRepo->makeShoppingOrder($shopping_user, $data); - + // CustomerPriority prüfen if ($shopping_user->is_from === 'shopping') { CustomerPriority::checkOne(ShoppingUser::find($shopping_user->id), true); } - + Util::setUserHistoryValue(['status' => 2, 'shopping_order_id' => $shopping_order->id]); // Zahlungsmethode verarbeiten @@ -188,7 +191,7 @@ class CheckoutController extends Controller } else { Yard::instance($this->instance)->setShippingCountryWithPrice($data['shipping_state'], $data['is_for']); } - + return back()->withInput(Request::all()); } @@ -220,7 +223,7 @@ class CheckoutController extends Controller 'shipping_salutation' => 'required' ]); } - + return Validator::make(Request::all(), $rules); } @@ -236,7 +239,7 @@ class CheckoutController extends Controller { $result = []; $payment_method = Request::get('payment_method'); - + // Kreditkarte prüfen if ($payment_method === 'cc') { $result = $this->checkCreditCard($data, $shopping_user, $shopping_order); @@ -260,7 +263,7 @@ class CheckoutController extends Controller $reference = $pay->setPrePayment($payment_method, $amount, 'EUR', $result); $this->checkoutRepo->putSessionPayments('payment_reference', $reference); $pay->setPersonalData(); - + return $pay->ResponseData(); } @@ -277,7 +280,7 @@ class CheckoutController extends Controller $pay = new PayoneController(); $pay->init($shopping_user, $shopping_order); $ret['cc'] = $pay->checkCreditCard($data); - + if ($ret['cc']['status'] === 'ERROR' || $ret['cc']['status'] === 'INVALID') { Session::flash('cc-error', 1); Session::flash('errormessage', $ret['cc']['errormessage']); @@ -303,14 +306,14 @@ class CheckoutController extends Controller $pay->init($shopping_user, $shopping_order); $amount = Yard::instance($this->instance)->totalWithShipping(2, '.', '') * 100; $ret['elv'] = $pay->checkBankAccount($data, $amount, 'EUR', $shopping_user); - + if ($ret['elv']['status'] === 'ERROR' || $ret['elv']['status'] === 'INVALID') { Session::flash('elv-error', 1); Session::flash('errormessage', $ret['elv']['errormessage']); Session::flash('customermessage', $ret['elv']['customermessage']); return redirect(route('checkout.checkout_card'))->withInput(Request::all()); } - + if ($ret['elv']['status'] === 'APPROVED' && $ret['elv']['mandate_status'] !== "active") { Session::flash('elv-managemandate', 1); Session::flash('elv-mandate_identification', $ret['elv']['mandate_identification']); @@ -318,7 +321,7 @@ class CheckoutController extends Controller Session::flash('elv-creditor_identifier', $ret['elv']['creditor_identifier']); return redirect(route('checkout.checkout_card'))->withInput(Request::all()); } - + $ret['elv']['bankaccountholder'] = $data['elv_bankaccountholder']; } else { $ret['elv'] = [ @@ -328,7 +331,7 @@ class CheckoutController extends Controller 'bic' => $data['elv_bic'], 'bankaccountholder' => $data['elv_bankaccountholder'] ]; - + $this->storeUserPaymentsData($shopping_user, $ret); } $ret['returnstatus'] = 'VALID'; @@ -347,7 +350,7 @@ class CheckoutController extends Controller 'is_checkout' => true, 'yard_instance' => $this->instance, ]; - + return view('web.templates.checkout-is-final', $data); } @@ -364,13 +367,13 @@ class CheckoutController extends Controller $ShoppingPayment = ShoppingPayment::where('shopping_order_id', $shopping_order_id) ->where('reference', $reference) ->first(); - + if (!$ShoppingPayment) { Util::setUserHistoryValue(['status' => 21]); Session::flash('checkout-error', 'Der Zahlungsvorgang konnte nicht abgeschlossen werden, die Zahlung wurde nicht gefunden: ' . $reference); return redirect(route('checkout.checkout_card')); } - + $ShoppingPayment->status = $status; $ShoppingPayment->save(); @@ -384,7 +387,7 @@ class CheckoutController extends Controller Session::flash('checkout-error', 'Der Zahlungsvorgang wurde abgebrochen, die Bestellung konnte nicht ausgeführt werden.'); return redirect(route('checkout.checkout_card')); } - + if ($status === "error") { Util::setUserHistoryValue(['status' => 23]); Util::setInstanceStatus(6); // link_failed @@ -419,7 +422,7 @@ class CheckoutController extends Controller 'is_checkout' => true, 'yard_instance' => $this->instance, ]; - + return view('web.templates.checkout-final', $data); } @@ -457,7 +460,7 @@ class CheckoutController extends Controller 'is_checkout' => true, 'yard_instance' => $this->instance, ]; - + return view('web.templates.checkout-final', $data); } @@ -493,20 +496,20 @@ class CheckoutController extends Controller $shopping_order = ShoppingOrder::find($payt->transmitted_data['param']); $shopping_order->txaction = 'invoice_open'; $shopping_order->save(); - + $shopping_payment = ShoppingPayment::where('reference', $payt->transmitted_data['reference'])->first(); if ($shopping_payment) { $shopping_payment->txaction = 'invoice_open'; $shopping_payment->save(); } - + $send_link = Payment::paymentStatusPaidAction($shopping_order, false, $shopping_payment); $data = [ 'mode' => $payt->transmitted_data['mode'], 'txaction' => $payt->txaction, 'send_link' => $send_link, ]; - + Payment::paymentStatusSendMail($shopping_order, $shopping_payment, $data); } } @@ -539,7 +542,7 @@ class CheckoutController extends Controller //Bestelllink if ($is_for === 'ot-customer' || $is_for === 'abo-ot-customer') { //customer shop mit den Daten aus dem Salescenter shopping_data - return $this->checkoutRepo->makeCustomerShoppingUser($shopping_data, $is_for, $is_from); + return $this->checkoutRepo->makeCustomerShoppingUser($shopping_data, $is_for, $is_from); } //Webshop return $this->checkoutRepo->initShoppingUser($is_for, $is_from, $homeparty_id); @@ -548,7 +551,7 @@ class CheckoutController extends Controller return $this->getExistingShoppingUser(); } - /** + /** * Holt den existierenden ShoppingUser und bereitet ihn vor * * @return ShoppingUser @@ -559,8 +562,7 @@ class CheckoutController extends Controller $shopping_user->billing_state = Shop::getCountryShippingCountryId($shopping_user->billing_country_id); $shopping_user->shipping_state = Shop::getCountryShippingCountryId($shopping_user->shipping_country_id); $shopping_user->same_as_billing = $shopping_user->same_as_billing ? false : true; // reinvert - + return $shopping_user; } - -} \ No newline at end of file +} diff --git a/app/Mail/MailAutoReleaseAccount.php b/app/Mail/MailAutoReleaseAccount.php index 03ae254d..472de5df 100644 --- a/app/Mail/MailAutoReleaseAccount.php +++ b/app/Mail/MailAutoReleaseAccount.php @@ -1,4 +1,5 @@ user->account->salutation))." "; - $content .= $this->user->account->first_name." ".$this->user->account->last_name."\n"; - $content .= $this->user->account->address."\n"; - $content .= $this->user->account->zipcode." ".$this->user->account->city."\n"; - $content .= $this->user->account->country_id ? $this->user->account->country->de."\n\n" : "\n\n"; - if($this->user->account->phone){ + $content = __(strtoupper($this->user->account->salutation)) . " "; + $content .= $this->user->account->first_name . " " . $this->user->account->last_name . "\n"; + $content .= $this->user->account->address . "\n"; + $content .= $this->user->account->zipcode . " " . $this->user->account->city . "\n"; + $content .= $this->user->account->country_id ? $this->user->account->country->de . "\n\n" : "\n\n"; + if ($this->user->account->phone) { $content .= "Telefon: "; - $content .= $this->user->account->pre_phone_id ? $this->user->account->pre_phone->phone." " : " "; + $content .= $this->user->account->pre_phone_id ? $this->user->account->pre_phone->phone . " " : " "; $content .= $this->user->account->phone; } - if($this->user->account->mobil){ + if ($this->user->account->mobil) { $content .= "Mobil: "; - $content .= $this->user->account->pre_mobil_id ? $this->user->account->pre_mobil->phone." " : " "; + $content .= $this->user->account->pre_mobil_id ? $this->user->account->pre_mobil->phone . " " : " "; $content .= $this->user->account->mobil; } - $content .= "E-Mail: ".$this->user->email; + $content .= "E-Mail: " . $this->user->email; - $copy1line = "Ein neuer Berater hat sich registriert und wurde automatisch freigeschaltet. Seine Daten müssen nachträglich Überprüfung werden:"."\n"; - $copy1line .= "+ Überprüfung der Ausweisdaten"."\n"; - $copy1line .= "+ Überprüfung des Gewerbenachweises"."\n"; - $copy1line .= "+ Eintrag Account ID"."\n"; - $copy1line .= "+ Überprüfung / Kenntnisnahme Sponsor"."\n"; - $copy1line .= "+ Überprüfung der Rechnungsdaten"."\n"; - $copy1line .= 'Sollte Daten nicht vollständig sein, bitte Kontakt zum Berater aufnehmen.'."\n"; + $copy1line = "Ein neuer Berater hat sich registriert und wurde automatisch freigeschaltet. Seine Daten müssen nachträglich Überprüfung werden:" . "\n"; + $copy1line .= "+ Überprüfung der Ausweisdaten" . "\n"; + $copy1line .= "+ Überprüfung des Gewerbenachweises" . "\n"; + $copy1line .= "+ Eintrag Account ID" . "\n"; + $copy1line .= "+ Überprüfung / Kenntnisnahme Sponsor" . "\n"; + $copy1line .= "+ Überprüfung der Rechnungsdaten" . "\n"; + $copy1line .= 'Sollte Daten nicht vollständig sein, bitte Kontakt zum Berater aufnehmen.' . "\n"; return $this->view('emails.info')->with([ - 'url' => config('app.url_crm') . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', + 'url' => \App\Services\Util::getMyMivitaUrl() . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', 'title' => 'Berater Registrierung prüfen', 'button' => 'zur Berater Prüfung', 'copy1line' => $copy1line, @@ -59,4 +60,4 @@ class MailAutoReleaseAccount extends Mailable 'content' => $content, ]); } -} \ No newline at end of file +} diff --git a/app/Mail/MailInfo.php b/app/Mail/MailInfo.php index 3a24f0a6..681ce596 100644 --- a/app/Mail/MailInfo.php +++ b/app/Mail/MailInfo.php @@ -1,4 +1,5 @@ action = $action; $this->data = $data; - if($this->action === "delete_membership"){ + if ($this->action === "delete_membership") { $this->subject = 'Mitgliedschaft beenden - beantragt'; } - if($this->action === "check_is_like_customer"){ + if ($this->action === "check_is_like_customer") { $this->subject = 'Kunden überprüfen - Kundenhoheit'; } - if($this->action === "change_is_like_customer"){ + if ($this->action === "change_is_like_customer") { $this->subject = 'Kunden erneut überprüfen - Kundenhoheit'; } } @@ -40,68 +41,68 @@ class MailInfo extends Mailable { $content = ""; - if($this->action === "delete_membership"){ - $content .= __(strtoupper($this->user->account->salutation))." "; - $content .= $this->user->account->first_name." ".$this->user->account->last_name."\n"; - $content .= $this->user->account->address."\n"; - $content .= $this->user->account->zipcode." ".$this->user->account->city."\n"; - $content .= $this->user->account->country_id ? $this->user->account->country->de."\n\n" : "\n\n"; - if($this->user->account->phone){ + if ($this->action === "delete_membership") { + $content .= __(strtoupper($this->user->account->salutation)) . " "; + $content .= $this->user->account->first_name . " " . $this->user->account->last_name . "\n"; + $content .= $this->user->account->address . "\n"; + $content .= $this->user->account->zipcode . " " . $this->user->account->city . "\n"; + $content .= $this->user->account->country_id ? $this->user->account->country->de . "\n\n" : "\n\n"; + if ($this->user->account->phone) { $content .= "Telefon: "; - $content .= $this->user->account->pre_phone_id ? $this->user->account->pre_phone->phone." " : " "; + $content .= $this->user->account->pre_phone_id ? $this->user->account->pre_phone->phone . " " : " "; $content .= $this->user->account->phone; } - if($this->user->account->mobil){ + if ($this->user->account->mobil) { $content .= "Mobil: "; - $content .= $this->user->account->pre_mobil_id ? $this->user->account->pre_mobil->phone." " : " "; + $content .= $this->user->account->pre_mobil_id ? $this->user->account->pre_mobil->phone . " " : " "; $content .= $this->user->account->mobil; } - $content .= "E-Mail: ".$this->user->email; + $content .= "E-Mail: " . $this->user->email; - $copy1line = "Infos zum Berater:"."\n"; + $copy1line = "Infos zum Berater:" . "\n"; $button = "zum Berater"; $title = "Ein Berater möchte seine Mitgliedschaft beenden."; - $url = config('app.url_crm') . '/admin/lead/edit/' . $this->user->id . '?show=check_lead'; + $url = \App\Services\Util::getMyMivitaUrl() . '/admin/lead/edit/' . $this->user->id . '?show=check_lead'; } - if($this->action === "check_is_like_customer") { - $copy1line = "Hier geht es zum Kunden:"."\n"; + if ($this->action === "check_is_like_customer") { + $copy1line = "Hier geht es zum Kunden:" . "\n"; $button = "zum Kunden"; $title = "Ein Kunden muss überprüft werden und einem Berater zugeordnet werden, da die Adresse nicht eindeutig ist."; - $url = config('app.url_crm') . '/admin/customer/detail/' . $this->user->id; - $content .= $this->user ? 'Firma: '.$this->user->billing_company."\n" : ''; - $content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation)." "; - $content .= $this->user->billing_firstname." "; - $content .= $this->user->billing_lastname."\n"; + $url = \App\Services\Util::getMyMivitaUrl() . '/admin/customer/detail/' . $this->user->id; + $content .= $this->user ? 'Firma: ' . $this->user->billing_company . "\n" : ''; + $content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation) . " "; + $content .= $this->user->billing_firstname . " "; + $content .= $this->user->billing_lastname . "\n"; $content .= $this->user->billing_address; - $content .= $this->user->billing_address_2 ? '/ '.$this->user->billing_address_2."\n" : "\n"; - $content .= $this->user->billing_zipcode." "; - $content .= $this->user->billing_city."\n"; - $content .= $this->user->billing_email."\n"; - $content .= $this->user->billing_phone."\n"; + $content .= $this->user->billing_address_2 ? '/ ' . $this->user->billing_address_2 . "\n" : "\n"; + $content .= $this->user->billing_zipcode . " "; + $content .= $this->user->billing_city . "\n"; + $content .= $this->user->billing_email . "\n"; + $content .= $this->user->billing_phone . "\n"; $content .= $this->user->billing_country->getLocated(); } - if($this->action === "change_is_like_customer"){ - $copy1line = "Hier geht es zum Kunden:"."\n"; + if ($this->action === "change_is_like_customer") { + $copy1line = "Hier geht es zum Kunden:" . "\n"; $button = "zum Kunden"; $title = "Ein Kunden muss erneut überprüft werden, da bei einer Änderung eine bestehende Kundenhoheit gefunden wurde."; - $url = config('app.url_crm') . '/admin/customer/detail/' . $this->user->id; - $content .= "Folgende Daten für die Kundenhoheit wurden geändert:"."\n"; - foreach ($this->data as $key=>$value){ - $content .= $this->user->{$key}." => ".$value."\n"; + $url = \App\Services\Util::getMyMivitaUrl() . '/admin/customer/detail/' . $this->user->id; + $content .= "Folgende Daten für die Kundenhoheit wurden geändert:" . "\n"; + foreach ($this->data as $key => $value) { + $content .= $this->user->{$key} . " => " . $value . "\n"; } - $content .= "\n"."\n"."Rechnungsadresse des Kunden vor der Änderung:"."\n"; - $content .= $this->user ? 'Firma: '.$this->user->billing_company."\n" : ''; - $content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation)." "; - $content .= $this->user->billing_firstname." "; - $content .= $this->user->billing_lastname."\n"; + $content .= "\n" . "\n" . "Rechnungsadresse des Kunden vor der Änderung:" . "\n"; + $content .= $this->user ? 'Firma: ' . $this->user->billing_company . "\n" : ''; + $content .= \App\Services\HTMLHelper::getSalutationLang($this->user->billing_salutation) . " "; + $content .= $this->user->billing_firstname . " "; + $content .= $this->user->billing_lastname . "\n"; $content .= $this->user->billing_address; - $content .= $this->user->billing_address_2 ? '/ '.$this->user->billing_address_2."\n" : "\n"; - $content .= $this->user->billing_zipcode." "; - $content .= $this->user->billing_city."\n"; - $content .= $this->user->billing_email."\n"; - $content .= $this->user->billing_phone."\n"; + $content .= $this->user->billing_address_2 ? '/ ' . $this->user->billing_address_2 . "\n" : "\n"; + $content .= $this->user->billing_zipcode . " "; + $content .= $this->user->billing_city . "\n"; + $content .= $this->user->billing_email . "\n"; + $content .= $this->user->billing_phone . "\n"; $content .= $this->user->billing_country->getLocated(); } return $this->view('emails.info')->with([ @@ -113,4 +114,4 @@ class MailInfo extends Mailable 'content' => $content, ]); } -} \ No newline at end of file +} diff --git a/app/Mail/MailReleaseAccount.php b/app/Mail/MailReleaseAccount.php index 83284400..3c74d0f9 100644 --- a/app/Mail/MailReleaseAccount.php +++ b/app/Mail/MailReleaseAccount.php @@ -1,4 +1,5 @@ user->account->salutation))." "; - $content .= $this->user->account->first_name." ".$this->user->account->last_name."\n"; - $content .= $this->user->account->address."\n"; - $content .= $this->user->account->zipcode." ".$this->user->account->city."\n"; - $content .= $this->user->account->country_id ? $this->user->account->country->de."\n\n" : "\n\n"; - if($this->user->account->phone){ + $content = __(strtoupper($this->user->account->salutation)) . " "; + $content .= $this->user->account->first_name . " " . $this->user->account->last_name . "\n"; + $content .= $this->user->account->address . "\n"; + $content .= $this->user->account->zipcode . " " . $this->user->account->city . "\n"; + $content .= $this->user->account->country_id ? $this->user->account->country->de . "\n\n" : "\n\n"; + if ($this->user->account->phone) { $content .= "Telefon: "; - $content .= $this->user->account->pre_phone_id ? $this->user->account->pre_phone->phone." " : " "; + $content .= $this->user->account->pre_phone_id ? $this->user->account->pre_phone->phone . " " : " "; $content .= $this->user->account->phone; } - if($this->user->account->mobil){ + if ($this->user->account->mobil) { $content .= "Mobil: "; - $content .= $this->user->account->pre_mobil_id ? $this->user->account->pre_mobil->phone." " : " "; + $content .= $this->user->account->pre_mobil_id ? $this->user->account->pre_mobil->phone . " " : " "; $content .= $this->user->account->mobil; } - $content .= "E-Mail: ".$this->user->email; + $content .= "E-Mail: " . $this->user->email; - $copy1line = "Ein neuer Berater hat sich registriert und wartet auf die Überprüfung und Freigabe seiner Daten:"."\n"; - $copy1line .= "+ Überprüfung der Ausweisdaten"."\n"; - $copy1line .= "+ Überprüfung des Gewerbenachweises"."\n"; - $copy1line .= "+ Eintrag Account ID"."\n"; - $copy1line .= "+ Überprüfung / Kenntnisnahme Sponsor"."\n"; - $copy1line .= "+ Überprüfung der Rechnungsdaten"."\n"; - $copy1line .= 'Nach erfolgreicher Überprüfung mit dem Button „Daten vollständig => Berater freischalten“ den Berater freischalten.'."\n"; - $copy1line .= 'Der Berater erhält eine Mail, dass sein Account freigeschaltet wurde. Der Vertrag wird automatisch mit den Daten des Vertriebspartners erstellt.'."\n"; + $copy1line = "Ein neuer Berater hat sich registriert und wartet auf die Überprüfung und Freigabe seiner Daten:" . "\n"; + $copy1line .= "+ Überprüfung der Ausweisdaten" . "\n"; + $copy1line .= "+ Überprüfung des Gewerbenachweises" . "\n"; + $copy1line .= "+ Eintrag Account ID" . "\n"; + $copy1line .= "+ Überprüfung / Kenntnisnahme Sponsor" . "\n"; + $copy1line .= "+ Überprüfung der Rechnungsdaten" . "\n"; + $copy1line .= 'Nach erfolgreicher Überprüfung mit dem Button „Daten vollständig => Berater freischalten“ den Berater freischalten.' . "\n"; + $copy1line .= 'Der Berater erhält eine Mail, dass sein Account freigeschaltet wurde. Der Vertrag wird automatisch mit den Daten des Vertriebspartners erstellt.' . "\n"; return $this->view('emails.info')->with([ - 'url' => config('app.url_crm') . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', + 'url' => \App\Services\Util::getMyMivitaUrl() . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', 'title' => 'Berater Registrierung prüfen', 'button' => 'zur Berater Prüfung', 'copy1line' => $copy1line, @@ -60,4 +61,4 @@ class MailReleaseAccount extends Mailable 'content' => $content, ]); } -} \ No newline at end of file +} diff --git a/app/Mail/MailReleaseDocument.php b/app/Mail/MailReleaseDocument.php index 764ff1c4..cf386907 100644 --- a/app/Mail/MailReleaseDocument.php +++ b/app/Mail/MailReleaseDocument.php @@ -1,4 +1,5 @@ user->account->salutation))." "; - $content .= $this->user->account->first_name." ".$this->user->account->last_name."\n"; - $content .= $this->user->account->address."\n"; - $content .= $this->user->account->zipcode." ".$this->user->account->city."\n"; - $content .= $this->user->account->country_id ? $this->user->account->country->de."\n\n" : "\n\n"; - $content .= "E-Mail: ".$this->user->email; + $content = __(strtoupper($this->user->account->salutation)) . " "; + $content .= $this->user->account->first_name . " " . $this->user->account->last_name . "\n"; + $content .= $this->user->account->address . "\n"; + $content .= $this->user->account->zipcode . " " . $this->user->account->city . "\n"; + $content .= $this->user->account->country_id ? $this->user->account->country->de . "\n\n" : "\n\n"; + $content .= "E-Mail: " . $this->user->email; - $copy1line = "Ein Berater hat Daten zum Gewerbenachweis geändert, bitte um Prüfung:"."\n\n"; + $copy1line = "Ein Berater hat Daten zum Gewerbenachweis geändert, bitte um Prüfung:" . "\n\n"; $business_license_choose = $this->user->account->getNotice('business_license'); - if($business_license_choose === 'now'){ - $copy1line .= "+ Gewerbeschein jetzt zur Freigabe"."\n\n"; + if ($business_license_choose === 'now') { + $copy1line .= "+ Gewerbeschein jetzt zur Freigabe" . "\n\n"; } - if($business_license_choose === 'later'){ - $copy1line .= "+ Ich reiche meinen Gewerbeschein innerhalb der nächsten 4 Wochen nach"."\n\n"; + if ($business_license_choose === 'later') { + $copy1line .= "+ Ich reiche meinen Gewerbeschein innerhalb der nächsten 4 Wochen nach" . "\n\n"; } - if($business_license_choose === 'non'){ - $copy1line .= "+ Ich benötige keinen Gewerbeschein"."\n"; - $copy1line .= "+ Begründung: ".$this->user->account->getNotice('business_license_reason')."\n\n"; + if ($business_license_choose === 'non') { + $copy1line .= "+ Ich benötige keinen Gewerbeschein" . "\n"; + $copy1line .= "+ Begründung: " . $this->user->account->getNotice('business_license_reason') . "\n\n"; } - - $copy1line .= 'Bei fehlerhafter Angabe nimm bitte kontakt mit dem Berater auf.'."\n"; + + $copy1line .= 'Bei fehlerhafter Angabe nimm bitte kontakt mit dem Berater auf.' . "\n"; return $this->view('emails.info')->with([ - 'url' => config('app.url_crm') . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', + 'url' => \App\Services\Util::getMyMivitaUrl() . '/admin/lead/edit/' . $this->user->id . '?show=check_lead', 'title' => 'Berater Unterlagen prüfen', 'button' => 'zur Berater Prüfung', 'copy1line' => $copy1line, @@ -56,4 +57,4 @@ class MailReleaseDocument extends Mailable 'content' => $content, ]); } -} \ No newline at end of file +} diff --git a/app/Models/Customer.php b/app/Models/Customer.php index ec9dad76..bce50a8c 100644 --- a/app/Models/Customer.php +++ b/app/Models/Customer.php @@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; // Wichtig! /** - * - * * @property int $id * @property string|null $name * @property string $email diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php new file mode 100644 index 00000000..59599dc9 --- /dev/null +++ b/app/Providers/HorizonServiceProvider.php @@ -0,0 +1,36 @@ +email, [ + // + ]); + }); + } +} diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 361a2807..b71b50df 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -58,7 +58,7 @@ class RouteServiceProvider extends ServiceProvider /** @var DomainContext $context */ $context = app(DomainContext::class); $this->loadSharedRoutes(); - + \Log::info('loadDomainAwareRoutes', ['context' => $context]); match ($context->type) { 'main' => $this->loadDomainRoutes('main', 'main.php'), 'main-shop' => [ diff --git a/bootstrap/cache/events.php b/bootstrap/cache/events.php new file mode 100644 index 00000000..02e2fc9e --- /dev/null +++ b/bootstrap/cache/events.php @@ -0,0 +1,9 @@ + + array ( + 'App\\Events\\Event' => + array ( + 0 => 'App\\Listeners\\EventListener', + ), + ), +); \ No newline at end of file diff --git a/bootstrap/cache/packages.php b/bootstrap/cache/packages.php index bd818981..26049063 100755 --- a/bootstrap/cache/packages.php +++ b/bootstrap/cache/packages.php @@ -66,6 +66,17 @@ 0 => 'Laracasts\\Flash\\FlashServiceProvider', ), ), + 'laravel/horizon' => + array ( + 'aliases' => + array ( + 'Horizon' => 'Laravel\\Horizon\\Horizon', + ), + 'providers' => + array ( + 0 => 'Laravel\\Horizon\\HorizonServiceProvider', + ), + ), 'laravel/legacy-factories' => array ( 'providers' => diff --git a/bootstrap/cache/services.php b/bootstrap/cache/services.php index c49c1e7d..8650f4ef 100755 --- a/bootstrap/cache/services.php +++ b/bootstrap/cache/services.php @@ -31,31 +31,33 @@ 27 => 'JoeDixon\\Translation\\TranslationServiceProvider', 28 => 'JoeDixon\\Translation\\TranslationBindingsServiceProvider', 29 => 'Laracasts\\Flash\\FlashServiceProvider', - 30 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', - 31 => 'Laravel\\Passport\\PassportServiceProvider', - 32 => 'Laravel\\Sail\\SailServiceProvider', - 33 => 'Laravel\\Tinker\\TinkerServiceProvider', - 34 => 'Laravel\\Ui\\UiServiceProvider', - 35 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 36 => 'Carbon\\Laravel\\ServiceProvider', - 37 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 38 => 'Termwind\\Laravel\\TermwindServiceProvider', - 39 => 'Pest\\Laravel\\PestServiceProvider', - 40 => 'Spatie\\Html\\HtmlServiceProvider', - 41 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', - 42 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 43 => 'Laravel\\Tinker\\TinkerServiceProvider', - 44 => 'Acme\\Dhl\\DhlServiceProvider', - 45 => 'App\\Providers\\AppServiceProvider', - 46 => 'App\\Providers\\AuthServiceProvider', - 47 => 'App\\Providers\\EventServiceProvider', - 48 => 'App\\Providers\\DomainServiceProvider', - 49 => 'App\\Providers\\RouteServiceProvider', - 50 => 'Jenssegers\\Date\\DateServiceProvider', - 51 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 52 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 53 => 'App\\Providers\\YardServiceProvider', - 54 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', + 30 => 'Laravel\\Horizon\\HorizonServiceProvider', + 31 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', + 32 => 'Laravel\\Passport\\PassportServiceProvider', + 33 => 'Laravel\\Sail\\SailServiceProvider', + 34 => 'Laravel\\Tinker\\TinkerServiceProvider', + 35 => 'Laravel\\Ui\\UiServiceProvider', + 36 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 37 => 'Carbon\\Laravel\\ServiceProvider', + 38 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', + 39 => 'Termwind\\Laravel\\TermwindServiceProvider', + 40 => 'Pest\\Laravel\\PestServiceProvider', + 41 => 'Spatie\\Html\\HtmlServiceProvider', + 42 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', + 43 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 44 => 'Laravel\\Tinker\\TinkerServiceProvider', + 45 => 'Acme\\Dhl\\DhlServiceProvider', + 46 => 'App\\Providers\\AppServiceProvider', + 47 => 'App\\Providers\\AuthServiceProvider', + 48 => 'App\\Providers\\EventServiceProvider', + 49 => 'App\\Providers\\HorizonServiceProvider', + 50 => 'App\\Providers\\DomainServiceProvider', + 51 => 'App\\Providers\\RouteServiceProvider', + 52 => 'Jenssegers\\Date\\DateServiceProvider', + 53 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 54 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 55 => 'App\\Providers\\YardServiceProvider', + 56 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', ), 'eager' => array ( @@ -75,28 +77,30 @@ 13 => 'Jenssegers\\Date\\DateServiceProvider', 14 => 'JoeDixon\\Translation\\TranslationServiceProvider', 15 => 'Laracasts\\Flash\\FlashServiceProvider', - 16 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', - 17 => 'Laravel\\Passport\\PassportServiceProvider', - 18 => 'Laravel\\Ui\\UiServiceProvider', - 19 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 20 => 'Carbon\\Laravel\\ServiceProvider', - 21 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', - 22 => 'Termwind\\Laravel\\TermwindServiceProvider', - 23 => 'Pest\\Laravel\\PestServiceProvider', - 24 => 'Spatie\\Html\\HtmlServiceProvider', - 25 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', - 26 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 27 => 'Acme\\Dhl\\DhlServiceProvider', - 28 => 'App\\Providers\\AppServiceProvider', - 29 => 'App\\Providers\\AuthServiceProvider', - 30 => 'App\\Providers\\EventServiceProvider', - 31 => 'App\\Providers\\DomainServiceProvider', - 32 => 'App\\Providers\\RouteServiceProvider', - 33 => 'Jenssegers\\Date\\DateServiceProvider', - 34 => 'Maatwebsite\\Excel\\ExcelServiceProvider', - 35 => 'Yajra\\DataTables\\DataTablesServiceProvider', - 36 => 'App\\Providers\\YardServiceProvider', - 37 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', + 16 => 'Laravel\\Horizon\\HorizonServiceProvider', + 17 => 'Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider', + 18 => 'Laravel\\Passport\\PassportServiceProvider', + 19 => 'Laravel\\Ui\\UiServiceProvider', + 20 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 21 => 'Carbon\\Laravel\\ServiceProvider', + 22 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider', + 23 => 'Termwind\\Laravel\\TermwindServiceProvider', + 24 => 'Pest\\Laravel\\PestServiceProvider', + 25 => 'Spatie\\Html\\HtmlServiceProvider', + 26 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider', + 27 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 28 => 'Acme\\Dhl\\DhlServiceProvider', + 29 => 'App\\Providers\\AppServiceProvider', + 30 => 'App\\Providers\\AuthServiceProvider', + 31 => 'App\\Providers\\EventServiceProvider', + 32 => 'App\\Providers\\HorizonServiceProvider', + 33 => 'App\\Providers\\DomainServiceProvider', + 34 => 'App\\Providers\\RouteServiceProvider', + 35 => 'Jenssegers\\Date\\DateServiceProvider', + 36 => 'Maatwebsite\\Excel\\ExcelServiceProvider', + 37 => 'Yajra\\DataTables\\DataTablesServiceProvider', + 38 => 'App\\Providers\\YardServiceProvider', + 39 => 'Alban\\LaravelCollectiveSpatieHtmlParser\\ServiceProvider', ), 'deferred' => array ( diff --git a/composer.json b/composer.json index 1ccd3c29..e56cadb9 100755 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ "joedixon/laravel-translation": "2.x-dev", "laracasts/flash": "^3.2", "laravel/framework": "^11.0", + "laravel/horizon": "^5.33", "laravel/passport": "^12.0", "laravel/prompts": "^0.1.14", "laravel/tinker": "^2.9", @@ -29,16 +30,16 @@ "yajra/laravel-datatables-oracle": "^11.0" }, "require-dev": { - "spatie/laravel-ignition": "^2.0", - "nunomaduro/collision": "^8.1", - "fakerphp/faker": "^1.23", - "laravel/pint": "^1.0", - "laravel/sail": "^1.26", + "barryvdh/laravel-debugbar": "^3.13", + "barryvdh/laravel-ide-helper": "^3.6", + "fakerphp/faker": "^1.23", + "laravel/pint": "^1.0", + "laravel/sail": "^1.44", "mockery/mockery": "^1.6.2", - "pestphp/pest": "^2.0", - "pestphp/pest-plugin-laravel": "^2.0", - "barryvdh/laravel-debugbar": "^3.13", - "barryvdh/laravel-ide-helper": "^3.0" + "nunomaduro/collision": "^8.1", + "pestphp/pest": "^2.0", + "pestphp/pest-plugin-laravel": "^2.0", + "spatie/laravel-ignition": "^2.0" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 index 3f12675d..9e51763d --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7fc21677cad34a62767eaccbc243e7d6", + "content-hash": "925483d8104ae55ae4bf5fd0ada18726", "packages": [ { "name": "barryvdh/laravel-dompdf", @@ -1432,22 +1432,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.9.3", + "version": "7.10.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77" + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", - "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.3", - "guzzlehttp/psr7": "^2.7.0", + "guzzlehttp/promises": "^2.3", + "guzzlehttp/psr7": "^2.8", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1538,7 +1538,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.9.3" + "source": "https://github.com/guzzle/guzzle/tree/7.10.0" }, "funding": [ { @@ -1554,20 +1554,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T13:37:11+00:00" + "time": "2025-08-23T22:36:01+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c" + "reference": "481557b130ef3790cf82b713667b43030dc9c957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c", - "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c", + "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957", + "reference": "481557b130ef3790cf82b713667b43030dc9c957", "shasum": "" }, "require": { @@ -1575,7 +1575,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "type": "library", "extra": { @@ -1621,7 +1621,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.2.0" + "source": "https://github.com/guzzle/promises/tree/2.3.0" }, "funding": [ { @@ -1637,20 +1637,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T13:27:01+00:00" + "time": "2025-08-22T14:34:08+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.7.1", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16" + "reference": "21dc724a0583619cd1652f673303492272778051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16", - "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", + "reference": "21dc724a0583619cd1652f673303492272778051", "shasum": "" }, "require": { @@ -1666,7 +1666,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "0.9.0", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -1737,7 +1737,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.7.1" + "source": "https://github.com/guzzle/psr7/tree/2.8.0" }, "funding": [ { @@ -1753,20 +1753,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T12:30:47+00:00" + "time": "2025-08-23T21:21:41+00:00" }, { "name": "guzzlehttp/uri-template", - "version": "v1.0.4", + "version": "v1.0.5", "source": { "type": "git", "url": "https://github.com/guzzle/uri-template.git", - "reference": "30e286560c137526eccd4ce21b2de477ab0676d2" + "reference": "4f4bbd4e7172148801e76e3decc1e559bdee34e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/uri-template/zipball/30e286560c137526eccd4ce21b2de477ab0676d2", - "reference": "30e286560c137526eccd4ce21b2de477ab0676d2", + "url": "https://api.github.com/repos/guzzle/uri-template/zipball/4f4bbd4e7172148801e76e3decc1e559bdee34e1", + "reference": "4f4bbd4e7172148801e76e3decc1e559bdee34e1", "shasum": "" }, "require": { @@ -1775,7 +1775,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "phpunit/phpunit": "^8.5.44 || ^9.6.25", "uri-template/tests": "1.0.0" }, "type": "library", @@ -1823,7 +1823,7 @@ ], "support": { "issues": "https://github.com/guzzle/uri-template/issues", - "source": "https://github.com/guzzle/uri-template/tree/v1.0.4" + "source": "https://github.com/guzzle/uri-template/tree/v1.0.5" }, "funding": [ { @@ -1839,7 +1839,7 @@ "type": "tidelift" } ], - "time": "2025-02-03T10:55:03+00:00" + "time": "2025-08-22T14:27:06+00:00" }, { "name": "intervention/gif", @@ -2401,6 +2401,86 @@ }, "time": "2025-08-13T20:28:00+00:00" }, + { + "name": "laravel/horizon", + "version": "v5.33.4", + "source": { + "type": "git", + "url": "https://github.com/laravel/horizon.git", + "reference": "678362049ce5b9ce96673ac0282bbfda3279eca9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/horizon/zipball/678362049ce5b9ce96673ac0282bbfda3279eca9", + "reference": "678362049ce5b9ce96673ac0282bbfda3279eca9", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-pcntl": "*", + "ext-posix": "*", + "illuminate/contracts": "^9.21|^10.0|^11.0|^12.0", + "illuminate/queue": "^9.21|^10.0|^11.0|^12.0", + "illuminate/support": "^9.21|^10.0|^11.0|^12.0", + "nesbot/carbon": "^2.17|^3.0", + "php": "^8.0", + "ramsey/uuid": "^4.0", + "symfony/console": "^6.0|^7.0", + "symfony/error-handler": "^6.0|^7.0", + "symfony/polyfill-php83": "^1.28", + "symfony/process": "^6.0|^7.0" + }, + "require-dev": { + "mockery/mockery": "^1.0", + "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", + "phpstan/phpstan": "^1.10|^2.0", + "phpunit/phpunit": "^9.0|^10.4|^11.5|^12.0", + "predis/predis": "^1.1|^2.0|^3.0" + }, + "suggest": { + "ext-redis": "Required to use the Redis PHP driver.", + "predis/predis": "Required when not using the Redis PHP driver (^1.1|^2.0|^3.0)." + }, + "type": "library", + "extra": { + "laravel": { + "aliases": { + "Horizon": "Laravel\\Horizon\\Horizon" + }, + "providers": [ + "Laravel\\Horizon\\HorizonServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\Horizon\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "Dashboard and code-driven configuration for Laravel queues.", + "keywords": [ + "laravel", + "queue" + ], + "support": { + "issues": "https://github.com/laravel/horizon/issues", + "source": "https://github.com/laravel/horizon/tree/v5.33.4" + }, + "time": "2025-08-25T13:31:24+00:00" + }, { "name": "laravel/legacy-factories", "version": "v1.4.1", @@ -3613,16 +3693,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.66", + "version": "3.1.67", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "3b29c2426a46674f444890c45f742452a396aae8" + "reference": "e508e34a502a3acc3329b464dad257378a7edb4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/3b29c2426a46674f444890c45f742452a396aae8", - "reference": "3b29c2426a46674f444890c45f742452a396aae8", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/e508e34a502a3acc3329b464dad257378a7edb4d", + "reference": "e508e34a502a3acc3329b464dad257378a7edb4d", "shasum": "" }, "require": { @@ -3630,7 +3710,7 @@ "ext-json": "*", "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0||^11.0||^12.0", "php": "^7.0||^8.0", - "phpoffice/phpspreadsheet": "^1.29.12", + "phpoffice/phpspreadsheet": "^1.30.0", "psr/simple-cache": "^1.0||^2.0||^3.0" }, "require-dev": { @@ -3678,7 +3758,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.66" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.67" }, "funding": [ { @@ -3690,26 +3770,26 @@ "type": "github" } ], - "time": "2025-08-07T08:31:22+00:00" + "time": "2025-08-26T09:13:16+00:00" }, { "name": "maennchen/zipstream-php", - "version": "3.1.2", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "aeadcf5c412332eb426c0f9b4485f6accba2a99f" + "reference": "9712d8fa4cdf9240380b01eb4be55ad8dcf71416" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/aeadcf5c412332eb426c0f9b4485f6accba2a99f", - "reference": "aeadcf5c412332eb426c0f9b4485f6accba2a99f", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/9712d8fa4cdf9240380b01eb4be55ad8dcf71416", + "reference": "9712d8fa4cdf9240380b01eb4be55ad8dcf71416", "shasum": "" }, "require": { "ext-mbstring": "*", "ext-zlib": "*", - "php-64bit": "^8.2" + "php-64bit": "^8.3" }, "require-dev": { "brianium/paratest": "^7.7", @@ -3718,7 +3798,7 @@ "guzzlehttp/guzzle": "^7.5", "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.5", - "phpunit/phpunit": "^11.0", + "phpunit/phpunit": "^12.0", "vimeo/psalm": "^6.0" }, "suggest": { @@ -3760,7 +3840,7 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.2" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.2.0" }, "funding": [ { @@ -3768,7 +3848,7 @@ "type": "github" } ], - "time": "2025-01-27T12:07:53+00:00" + "time": "2025-07-17T11:15:13+00:00" }, { "name": "markbaker/complex", @@ -6406,16 +6486,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v7.3.0", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "497f73ac996a598c92409b44ac43b6690c4f666d" + "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d", - "reference": "497f73ac996a598c92409b44ac43b6690c4f666d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191", + "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191", "shasum": "" }, "require": { @@ -6466,7 +6546,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3" }, "funding": [ { @@ -6477,12 +6557,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-22T09:11:45+00:00" + "time": "2025-08-13T11:49:31+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -6630,16 +6714,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.3.2", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6" + "reference": "7475561ec27020196c49bb7c4f178d33d7d3dc00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6877c122b3a6cc3695849622720054f6e6fa5fa6", - "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7475561ec27020196c49bb7c4f178d33d7d3dc00", + "reference": "7475561ec27020196c49bb7c4f178d33d7d3dc00", "shasum": "" }, "require": { @@ -6689,7 +6773,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.3.2" + "source": "https://github.com/symfony/http-foundation/tree/v7.3.3" }, "funding": [ { @@ -6709,20 +6793,20 @@ "type": "tidelift" } ], - "time": "2025-07-10T08:47:49+00:00" + "time": "2025-08-20T08:04:18+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.3.2", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c" + "reference": "72c304de37e1a1cec6d5d12b81187ebd4850a17b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6ecc895559ec0097e221ed2fd5eb44d5fede083c", - "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/72c304de37e1a1cec6d5d12b81187ebd4850a17b", + "reference": "72c304de37e1a1cec6d5d12b81187ebd4850a17b", "shasum": "" }, "require": { @@ -6807,7 +6891,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.3.2" + "source": "https://github.com/symfony/http-kernel/tree/v7.3.3" }, "funding": [ { @@ -6827,20 +6911,20 @@ "type": "tidelift" } ], - "time": "2025-07-31T10:45:04+00:00" + "time": "2025-08-29T08:23:45+00:00" }, { "name": "symfony/mailer", - "version": "v7.3.2", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b" + "reference": "a32f3f45f1990db8c4341d5122a7d3a381c7e575" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/d43e84d9522345f96ad6283d5dfccc8c1cfc299b", - "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b", + "url": "https://api.github.com/repos/symfony/mailer/zipball/a32f3f45f1990db8c4341d5122a7d3a381c7e575", + "reference": "a32f3f45f1990db8c4341d5122a7d3a381c7e575", "shasum": "" }, "require": { @@ -6891,7 +6975,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.3.2" + "source": "https://github.com/symfony/mailer/tree/v7.3.3" }, "funding": [ { @@ -6911,7 +6995,7 @@ "type": "tidelift" } ], - "time": "2025-07-15T11:36:08+00:00" + "time": "2025-08-13T11:49:31+00:00" }, { "name": "symfony/mime", @@ -7672,16 +7756,16 @@ }, { "name": "symfony/process", - "version": "v7.3.0", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af" + "reference": "32241012d521e2e8a9d713adb0812bb773b907f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af", - "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af", + "url": "https://api.github.com/repos/symfony/process/zipball/32241012d521e2e8a9d713adb0812bb773b907f1", + "reference": "32241012d521e2e8a9d713adb0812bb773b907f1", "shasum": "" }, "require": { @@ -7713,7 +7797,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.3.0" + "source": "https://github.com/symfony/process/tree/v7.3.3" }, "funding": [ { @@ -7724,12 +7808,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-17T09:11:12+00:00" + "time": "2025-08-18T09:42:54+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -7984,16 +8072,16 @@ }, { "name": "symfony/string", - "version": "v7.3.2", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca" + "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca", - "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca", + "url": "https://api.github.com/repos/symfony/string/zipball/17a426cce5fd1f0901fefa9b2a490d0038fd3c9c", + "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c", "shasum": "" }, "require": { @@ -8051,7 +8139,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.3.2" + "source": "https://github.com/symfony/string/tree/v7.3.3" }, "funding": [ { @@ -8071,7 +8159,7 @@ "type": "tidelift" } ], - "time": "2025-07-10T08:47:49+00:00" + "time": "2025-08-25T06:35:40+00:00" }, { "name": "symfony/translation", @@ -8326,16 +8414,16 @@ }, { "name": "symfony/var-dumper", - "version": "v7.3.2", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "53205bea27450dc5c65377518b3275e126d45e75" + "reference": "34d8d4c4b9597347306d1ec8eb4e1319b1e6986f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/53205bea27450dc5c65377518b3275e126d45e75", - "reference": "53205bea27450dc5c65377518b3275e126d45e75", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/34d8d4c4b9597347306d1ec8eb4e1319b1e6986f", + "reference": "34d8d4c4b9597347306d1ec8eb4e1319b1e6986f", "shasum": "" }, "require": { @@ -8389,7 +8477,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.3.2" + "source": "https://github.com/symfony/var-dumper/tree/v7.3.3" }, "funding": [ { @@ -8409,7 +8497,7 @@ "type": "tidelift" } ], - "time": "2025-07-29T20:02:46+00:00" + "time": "2025-08-13T11:49:31+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -11980,16 +12068,16 @@ }, { "name": "spatie/backtrace", - "version": "1.7.4", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/spatie/backtrace.git", - "reference": "cd37a49fce7137359ac30ecc44ef3e16404cccbe" + "reference": "8c0f16a59ae35ec8c62d85c3c17585158f430110" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/backtrace/zipball/cd37a49fce7137359ac30ecc44ef3e16404cccbe", - "reference": "cd37a49fce7137359ac30ecc44ef3e16404cccbe", + "url": "https://api.github.com/repos/spatie/backtrace/zipball/8c0f16a59ae35ec8c62d85c3c17585158f430110", + "reference": "8c0f16a59ae35ec8c62d85c3c17585158f430110", "shasum": "" }, "require": { @@ -12027,7 +12115,8 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/backtrace/tree/1.7.4" + "issues": "https://github.com/spatie/backtrace/issues", + "source": "https://github.com/spatie/backtrace/tree/1.8.1" }, "funding": [ { @@ -12039,7 +12128,7 @@ "type": "other" } ], - "time": "2025-05-08T15:41:09+00:00" + "time": "2025-08-26T08:22:30+00:00" }, { "name": "spatie/error-solutions", @@ -12360,16 +12449,16 @@ }, { "name": "symfony/yaml", - "version": "v7.3.2", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "b8d7d868da9eb0919e99c8830431ea087d6aae30" + "reference": "d4f4a66866fe2451f61296924767280ab5732d9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/b8d7d868da9eb0919e99c8830431ea087d6aae30", - "reference": "b8d7d868da9eb0919e99c8830431ea087d6aae30", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d4f4a66866fe2451f61296924767280ab5732d9d", + "reference": "d4f4a66866fe2451f61296924767280ab5732d9d", "shasum": "" }, "require": { @@ -12412,7 +12501,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.3.2" + "source": "https://github.com/symfony/yaml/tree/v7.3.3" }, "funding": [ { @@ -12432,7 +12521,7 @@ "type": "tidelift" } ], - "time": "2025-07-10T08:47:49+00:00" + "time": "2025-08-27T11:34:33+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", @@ -12554,6 +12643,6 @@ "platform": { "php": "^8.2" }, - "platform-dev": [], - "plugin-api-version": "2.2.0" + "platform-dev": {}, + "plugin-api-version": "2.6.0" } diff --git a/config/app.php b/config/app.php index f12baf38..227cd05e 100755 --- a/config/app.php +++ b/config/app.php @@ -59,7 +59,7 @@ return [ 'tld_shop' => env('APP_TLD_SHOP', '.lshop'), 'protocol' => env('APP_PROTOCOL', 'https://'), 'pre_url_main' => env('APP_URL_MAIN', ''), - 'pre_url_crm' => env('APP_URL_CRM', 'my.'), + 'pre_url_crm' => env('APP_PRE_URL_CRM', 'my.'), 'pre_url_portal' => env('APP_URL_PORTAL', 'in.'), 'checkout_url' => env('APP_URL_CHECKOUT', 'checkout.'), @@ -198,6 +198,7 @@ return [ App\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, + App\Providers\HorizonServiceProvider::class, App\Providers\DomainServiceProvider::class, App\Providers\RouteServiceProvider::class, Jenssegers\Date\DateServiceProvider::class, diff --git a/config/domains.php b/config/domains.php index 4aeb664b..b45b8ac2 100644 --- a/config/domains.php +++ b/config/domains.php @@ -30,13 +30,13 @@ return [ // Das CRM (z.B. my.mivita.care) 'crm' => [ - 'host' => env('APP_URL_CRM', 'my.') . env('APP_DOMAIN', 'mivita') . env('APP_TLD_CARE', '.care'), + 'host' => env('APP_PRE_URL_CRM', 'my.') . env('APP_DOMAIN', 'mivita') . env('APP_TLD_CARE', '.care'), 'type' => 'crm', ], // Das Partner-Portal (z.B. in.mivita.care) 'portal' => [ - 'host' => env('APP_URL_PORTAL', 'in.') . env('APP_DOMAIN', 'mivita') . env('APP_TLD_CARE', '.care'), + 'host' => env('APP_PRE_URL_PORTAL', 'in.') . env('APP_DOMAIN', 'mivita') . env('APP_TLD_CARE', '.care'), 'type' => 'portal', ], diff --git a/config/horizon.php b/config/horizon.php new file mode 100644 index 00000000..5101f6f0 --- /dev/null +++ b/config/horizon.php @@ -0,0 +1,213 @@ + env('HORIZON_DOMAIN'), + + /* + |-------------------------------------------------------------------------- + | Horizon Path + |-------------------------------------------------------------------------- + | + | This is the URI path where Horizon will be accessible from. Feel free + | to change this path to anything you like. Note that the URI will not + | affect the paths of its internal API that aren't exposed to users. + | + */ + + 'path' => env('HORIZON_PATH', 'horizon'), + + /* + |-------------------------------------------------------------------------- + | Horizon Redis Connection + |-------------------------------------------------------------------------- + | + | This is the name of the Redis connection where Horizon will store the + | meta information required for it to function. It includes the list + | of supervisors, failed jobs, job metrics, and other information. + | + */ + + 'use' => 'default', + + /* + |-------------------------------------------------------------------------- + | Horizon Redis Prefix + |-------------------------------------------------------------------------- + | + | This prefix will be used when storing all Horizon data in Redis. You + | may modify the prefix when you are running multiple installations + | of Horizon on the same server so that they don't have problems. + | + */ + + 'prefix' => env( + 'HORIZON_PREFIX', + Str::slug(env('APP_NAME', 'laravel'), '_').'_horizon:' + ), + + /* + |-------------------------------------------------------------------------- + | Horizon Route Middleware + |-------------------------------------------------------------------------- + | + | These middleware will get attached onto each Horizon route, giving you + | the chance to add your own middleware to this list or change any of + | the existing middleware. Or, you can simply stick with this list. + | + */ + + 'middleware' => ['web'], + + /* + |-------------------------------------------------------------------------- + | Queue Wait Time Thresholds + |-------------------------------------------------------------------------- + | + | This option allows you to configure when the LongWaitDetected event + | will be fired. Every connection / queue combination may have its + | own, unique threshold (in seconds) before this event is fired. + | + */ + + 'waits' => [ + 'redis:default' => 60, + ], + + /* + |-------------------------------------------------------------------------- + | Job Trimming Times + |-------------------------------------------------------------------------- + | + | Here you can configure for how long (in minutes) you desire Horizon to + | persist the recent and failed jobs. Typically, recent jobs are kept + | for one hour while all failed jobs are stored for an entire week. + | + */ + + 'trim' => [ + 'recent' => 60, + 'pending' => 60, + 'completed' => 60, + 'recent_failed' => 10080, + 'failed' => 10080, + 'monitored' => 10080, + ], + + /* + |-------------------------------------------------------------------------- + | Silenced Jobs + |-------------------------------------------------------------------------- + | + | Silencing a job will instruct Horizon to not place the job in the list + | of completed jobs within the Horizon dashboard. This setting may be + | used to fully remove any noisy jobs from the completed jobs list. + | + */ + + 'silenced' => [ + // App\Jobs\ExampleJob::class, + ], + + /* + |-------------------------------------------------------------------------- + | Metrics + |-------------------------------------------------------------------------- + | + | Here you can configure how many snapshots should be kept to display in + | the metrics graph. This will get used in combination with Horizon's + | `horizon:snapshot` schedule to define how long to retain metrics. + | + */ + + 'metrics' => [ + 'trim_snapshots' => [ + 'job' => 24, + 'queue' => 24, + ], + ], + + /* + |-------------------------------------------------------------------------- + | Fast Termination + |-------------------------------------------------------------------------- + | + | When this option is enabled, Horizon's "terminate" command will not + | wait on all of the workers to terminate unless the --wait option + | is provided. Fast termination can shorten deployment delay by + | allowing a new instance of Horizon to start while the last + | instance will continue to terminate each of its workers. + | + */ + + 'fast_termination' => false, + + /* + |-------------------------------------------------------------------------- + | Memory Limit (MB) + |-------------------------------------------------------------------------- + | + | This value describes the maximum amount of memory the Horizon master + | supervisor may consume before it is terminated and restarted. For + | configuring these limits on your workers, see the next section. + | + */ + + 'memory_limit' => 64, + + /* + |-------------------------------------------------------------------------- + | Queue Worker Configuration + |-------------------------------------------------------------------------- + | + | Here you may define the queue worker settings used by your application + | in all environments. These supervisors and settings handle all your + | queued jobs and will be provisioned by Horizon during deployment. + | + */ + + 'defaults' => [ + 'supervisor-1' => [ + 'connection' => 'redis', + 'queue' => ['default'], + 'balance' => 'auto', + 'autoScalingStrategy' => 'time', + 'maxProcesses' => 1, + 'maxTime' => 0, + 'maxJobs' => 0, + 'memory' => 128, + 'tries' => 1, + 'timeout' => 60, + 'nice' => 0, + ], + ], + + 'environments' => [ + 'production' => [ + 'supervisor-1' => [ + 'maxProcesses' => 10, + 'balanceMaxShift' => 1, + 'balanceCooldown' => 3, + ], + ], + + 'local' => [ + 'supervisor-1' => [ + 'maxProcesses' => 3, + ], + ], + ], +]; diff --git a/cron_script.sh b/cron_script.sh deleted file mode 100644 index a4d076b9..00000000 --- a/cron_script.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -echo $(date) # Will print the output of date command -/Applications/MAMP/bin/php/php7.3.33/bin/php -v -/Applications/MAMP/bin/php/php7.3.33/bin/php ../artisan business:store 0 0 2>&1 -#/usr/bin/php74 -v -#/usr/bin/php74 ../artisan business:store 0 0 2>&1 -# php /path/to/artisan schedule:run 1>> /dev/null 2>&1 -# cd /path-to-your-project && php artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file diff --git a/database/migrations/2022_03_07_131701_create_user_credits_table.php b/database/migrations/2022_03_07_131701_create_user_credits_table.php deleted file mode 100644 index 1a9db250..00000000 --- a/database/migrations/2022_03_07_131701_create_user_credits_table.php +++ /dev/null @@ -1,79 +0,0 @@ -id(); - - $table->unsignedInteger('auth_user_id')->nullable(); - $table->unsignedInteger('shopping_order_id')->nullable(); - $table->unsignedInteger('shopping_user_id')->nullable(); - - //invoice //credit - $table->string('type', 7)->index(); - - $table->string('str_number', 255)->nullable(); - $table->unsignedInteger('number', 255)->nullable(); - - $table->decimal('net', 13, 2)->nullable(); - $table->decimal('tax_rate', 8, 2)->nullable(); - $table->decimal('tax', 8, 2)->nullable(); - $table->decimal('total', 13, 2)->nullable(); - - $table->text('file')->nullable(); - $table->text('contents')->nullable(); - $table->text('infos')->nullable(); - - $table->string('subject')->nullable(); - $table->text('address')->nullable(); - - $table->boolean('paid')->default(false); - $table->date('paid_date')->nullable(); - - $table->unsignedInteger('cancellation_id')->nullable(); - $table->date('cancellation_date')->nullable(); - - $table->unsignedTinyInteger('status')->index()->default(0); - - $table->timestamps(); - $table->softDeletes(); - - $table->foreign('auth_user_id') - ->references('id') - ->on('users'); - - $table->foreign('shopping_order_id') - ->references('id') - ->on('shopping_orders'); - - $table->foreign('shopping_user_id') - ->references('id') - ->on('shopping_users'); - - $table->foreign('cancellation_id') - ->references('id') - ->on('users'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('user_credits'); - } -} diff --git a/database/migrations/2022_03_07_131701_create_user_invoice_credits_table.php b/database/migrations/2022_03_07_131701_create_user_invoice_credits_table.php deleted file mode 100644 index 079ec6d2..00000000 --- a/database/migrations/2022_03_07_131701_create_user_invoice_credits_table.php +++ /dev/null @@ -1,81 +0,0 @@ -increments('id'); - - $table->unsignedInteger('auth_user_id')->index()->nullable(); - $table->unsignedInteger('shopping_order_id')->index()->nullable(); - $table->unsignedInteger('shopping_user_id')->index()->nullable(); - - //invoice //credit - $table->string('type', 7)->index(); - $table->unsignedTinyInteger('month')->nullable(); - $table->unsignedSmallInteger('year')->nullable(); - - $table->string('full_number', 255)->nullable(); - $table->unsignedInteger('number')->nullable(); - - $table->decimal('net', 13, 2)->nullable(); - $table->decimal('tax_rate', 8, 2)->nullable(); - $table->decimal('tax', 8, 2)->nullable(); - $table->decimal('total', 13, 2)->nullable(); - - $table->text('file')->nullable(); - $table->text('contents')->nullable(); - $table->text('infos')->nullable(); - - $table->string('subject')->nullable(); - $table->text('address')->nullable(); - - $table->boolean('paid')->default(false); - $table->date('paid_date')->nullable(); - - $table->unsignedInteger('cancellation_id')->nullable(); - $table->date('cancellation_date')->nullable(); - - $table->unsignedTinyInteger('status')->index()->default(0); - - $table->timestamps(); - $table->softDeletes(); - - $table->foreign('auth_user_id') - ->references('id') - ->on('users'); - - $table->foreign('shopping_order_id') - ->references('id') - ->on('shopping_orders'); - - $table->foreign('shopping_user_id') - ->references('id') - ->on('shopping_users'); - - $table->foreign('cancellation_id') - ->references('id') - ->on('user_invoice_credits'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('user_invoice_credits'); - } -} diff --git a/database/migrations/2022_03_08_102231_create_users_sales_volumes_table.php b/database/migrations/2022_03_08_102231_create_users_sales_volumes_table.php deleted file mode 100644 index cb765995..00000000 --- a/database/migrations/2022_03_08_102231_create_users_sales_volumes_table.php +++ /dev/null @@ -1,56 +0,0 @@ -increments('id'); - $table->unsignedInteger('user_id'); - $table->unsignedInteger('shopping_order_id')->index()->nullable(); - - $table->unsignedTinyInteger('month')->nullable(); - $table->unsignedSmallInteger('year')->nullable(); - $table->date('date')->nullable(); - - $table->unsignedInteger('points')->nullable(); - $table->unsignedInteger('month_points')->nullable(); - - $table->decimal('total_net', 13, 2)->nullable(); - $table->decimal('month_total_net', 13, 2)->nullable(); - - $table->string('message', 255)->nullable(); - $table->unsignedTinyInteger('status')->index()->default(0); - - $table->timestamps(); - - $table->foreign('user_id') - ->references('id') - ->on('users'); - - $table->foreign('shopping_order_id') - ->references('id') - ->on('shopping_orders'); - - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('users_sales_volumes'); - } -} diff --git a/database/migrations/2022_07_25_140152_create_user_businesses_table.php b/database/migrations/2022_07_25_140152_create_user_businesses_table.php deleted file mode 100644 index 5a5dc0b0..00000000 --- a/database/migrations/2022_07_25_140152_create_user_businesses_table.php +++ /dev/null @@ -1,95 +0,0 @@ -increments('id'); - - $table->unsignedInteger('user_id'); - $table->unsignedTinyInteger('month')->nullable(); - $table->unsignedSmallInteger('year')->nullable(); - - $table->unsignedInteger('m_level_id')->nullable(); - $table->unsignedInteger('m_sponsor_id')->nullable(); - $table->text('sponsor')->nullable(); - - $table->string('m_sponsor_name')->nullable(); - $table->string('user_level_name')->nullable(); - - $table->boolean('active_account')->default(false); - $table->date('payment_account_date')->nullable(); - $table->date('active_date')->nullable(); - - $table->unsignedInteger('m_account')->nullable(); - - $table->string('email')->nullable(); - $table->string('first_name')->nullable(); - $table->string('last_name')->nullable(); - - $table->integer('sales_volume_points')->nullable(); - $table->integer('sales_volume_points_shop')->nullable(); - $table->integer('sales_volume_points_sum')->nullable(); - - $table->decimal('sales_volume_total', 13, 2)->nullable(); - $table->decimal('sales_volume_total_shop', 13, 2)->nullable(); - $table->decimal('sales_volume_total_sum', 13, 2)->nullable(); - - $table->unsignedTinyInteger('margin')->nullable(); - $table->unsignedTinyInteger('margin_shop')->nullable(); - - $table->decimal('commission_shop_sales', 13, 2)->nullable(); - - $table->unsignedSmallInteger('qual_kp')->nullable(); - $table->unsignedInteger('qual_tp')->nullable(); - - $table->integer('total_tp')->nullable(); - $table->integer('total_qual_tp')->nullable(); - - $table->decimal('commission_lines_total', 13, 2)->nullable(); - $table->decimal('commission_shop_sales', 13, 2)->nullable(); - - $table->text('businessLines')->nullable(); - $table->text('userItems')->nullable(); - $table->text('qual_user_level')->nullable(); - - - $table->timestamps(); - - /*$table->foreign('user_id') - ->references('id') - ->on('users'); - - $table->foreign('m_level') - ->references('id') - ->on('user_levels'); - - $table->foreign('m_sponsor') - ->references('id') - ->on('users');*/ - - - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('user_businesses'); - } -} diff --git a/database/migrations/2025_08_19_150653_create_jobs_table.php b/database/migrations/2025_08_19_150653_create_jobs_table.php new file mode 100644 index 00000000..6098d9b1 --- /dev/null +++ b/database/migrations/2025_08_19_150653_create_jobs_table.php @@ -0,0 +1,32 @@ +bigIncrements('id'); + $table->string('queue')->index(); + $table->longText('payload'); + $table->unsignedTinyInteger('attempts'); + $table->unsignedInteger('reserved_at')->nullable(); + $table->unsignedInteger('available_at'); + $table->unsignedInteger('created_at'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('jobs'); + } +}; diff --git a/database/migrations/2025_08_19_150658_create_failed_jobs_table.php b/database/migrations/2025_08_19_150658_create_failed_jobs_table.php new file mode 100644 index 00000000..249da817 --- /dev/null +++ b/database/migrations/2025_08_19_150658_create_failed_jobs_table.php @@ -0,0 +1,32 @@ +id(); + $table->string('uuid')->unique(); + $table->text('connection'); + $table->text('queue'); + $table->longText('payload'); + $table->longText('exception'); + $table->timestamp('failed_at')->useCurrent(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('failed_jobs'); + } +}; diff --git a/dev/bak/RouteServiceProvider.php.bak b/dev/bak/RouteServiceProvider.php similarity index 100% rename from dev/bak/RouteServiceProvider.php.bak rename to dev/bak/RouteServiceProvider.php diff --git a/dev/bak/Subdomain.php.bak b/dev/bak/Subdomain.php similarity index 100% rename from dev/bak/Subdomain.php.bak rename to dev/bak/Subdomain.php diff --git a/dev/code/Services/BusinessPlan/TreeCalcBot.php b/dev/code/Services/BusinessPlan/TreeCalcBot.php deleted file mode 100644 index fdceab90..00000000 --- a/dev/code/Services/BusinessPlan/TreeCalcBot.php +++ /dev/null @@ -1,599 +0,0 @@ -validateInput($month, $year); - $this->initializeDate($month, $year); - $this->initFrom = $initFrom; - - // Dependency Injection mit Fallback - $this->repository = $repository ?? new BusinessUserRepository($month, $year); - $this->renderer = $renderer ?? new TreeHtmlRenderer($initFrom); - $this->logger = $logger ?? app(LogContract::class); - } - - /** - * Initialisiert die Business-Struktur für Admin-Ansicht - */ - public function initStructureAdmin(bool $check = true): void - { - try { - $storedStructure = null; - - if ($check) { - $storedStructure = $this->repository->getStoredStructure(); - } - - if ($storedStructure) { - $this->logger->info("Loading stored business structure for {$this->date->month}/{$this->date->year}"); - $this->loadStoredStructure($storedStructure); - } else { - $this->logger->info("Building fresh business structure for {$this->date->month}/{$this->date->year}"); - $this->buildFreshStructure(); - } - - } catch (\Exception $e) { - $this->logger->error("Error initializing admin structure: " . $e->getMessage()); - throw $e; - } - } - - /** - * Initialisiert die Struktur für einen spezifischen User - */ - public function initStructureUser(int $userId): void - { - try { - $this->logger->info("Initializing structure for user: {$userId}"); - - $user = $this->repository->getUserWithRelations($userId); - if (!$user) { - $this->logger->warning("User not found: {$userId}"); - return; - } - - $businessUserItem = new BusinessUserItemOptimized($this->date); - $businessUserItem->makeUserFromModel($user); // ✅ Nutzt bereits geladene Relations - $this->addUserIdToProcessed($userId); - $this->businessUsers[] = $businessUserItem; - - $storedStructure = $this->repository->getStoredStructure(); - if ($storedStructure) { - $this->loadStoredParentsUsers($storedStructure); - if (isset($this->businessUsers[0]) && $this->businessUsers[0]->sponsor) { - $this->loadStoredSponsorUser($this->businessUsers[0]->sponsor->user_id); - } - } else { - $this->loadParentsUsers(); - $this->loadSponsorUser($userId); - } - - } catch (\Exception $e) { - $this->logger->error("Error initializing user structure for {$userId}: " . $e->getMessage()); - throw $e; - } - } - - /** - * Initialisiert detaillierte Business-User-Informationen - */ - public function initBusinesslUserDetail(User $user): void - { - try { - $this->logger->info("Initializing business user details for: {$user->id}"); - - $this->businessUser = new BusinessUserItemOptimized($this->date); - $this->businessUser->makeUserFromModel($user); // ✅ Nutzt bereits User-Objekt - $this->businessUser->checkSponsor($user); - - if (!$this->businessUser->isSave()) { - // Aufbau der Struktur für den User in die unendliche Tiefe - $this->businessUser->readParentsBusinessUsers(); - - // Calculate Points in Lines (optimiert für Memory-Effizienz) - if (count($this->businessUser->businessUserItems) > 0) { - $this->calculateUserPointsOptimized($this->businessUser->businessUserItems, 1); - } - - // Qualifikation nach qual_kp (KundenPoints) und qual_pp (PaylinePoints) - $this->businessUser->calcQualPP(); - } - - } catch (\Exception $e) { - $this->logger->error("Error initializing business user details for {$user->id}: " . $e->getMessage()); - throw $e; - } - } - - /** - * Gibt Growth Bonus zurück (ab Linie 6) - */ - public function getGrowthBonus(): array - { - if (!$this->businessUser || !$this->businessUser->business_lines) { - return []; - } - - if (count($this->businessUser->business_lines) > 6) { - $bLines = $this->businessUser->business_lines->toArray(); - return array_slice($bLines, 6); - } - - return []; - } - - /** - * Gibt Wert für spezifische Linie zurück - */ - public function getKeybyLine(int $line, string $key) - { - if (!$this->businessUser || !$this->businessUser->business_lines) { - return 0; - } - - $bLines = $this->businessUser->business_lines; - if (!isset($bLines[$line])) { - return 0; - } - - $lineData = $bLines[$line]; - - if ($lineData instanceof stdClass) { - return $lineData->{$key} ?? 0; - } - - if (is_array($lineData)) { - return $lineData[$key] ?? 0; - } - - return 0; - } - - /** - * HTML-Rendering Methoden (Delegation an Renderer) - */ - public function makeHtmlTree(): string - { - return $this->renderer->renderTree($this->businessUsers); - } - - public function makeParentlessHtml(): string - { - return $this->renderer->renderParentless($this->parentless); - } - - public function makeSponsorHtml(): string - { - return $this->renderer->renderSponsor($this->sponsor); - } - - /** - * Getter-Methoden (Rückwärtskompatibilität) - */ - public function getItems(): array - { - return $this->businessUsers; - } - - public function isParentless(): bool - { - return !empty($this->parentless); - } - - /** - * Static Methoden (Rückwärtskompatibilität) - */ - public static function isFromStored(int $month, int $year): ?UserBusinessStructure - { - $structure = UserBusinessStructure::where('year', $year) - ->where('month', $month) - ->first(); - - return ($structure && $structure->completed) ? $structure : null; - } - - public static function addUserID(int $id): void - { - // Deprecated: Wird durch Instanz-Methode ersetzt - // Bleibt für Rückwärtskompatibilität erhalten - } - - // ===== Private Methoden ===== - - /** - * Validiert Eingabeparameter - */ - private function validateInput(int $month, int $year): void - { - if ($month < 1 || $month > 12) { - throw new \InvalidArgumentException("Invalid month: {$month}"); - } - - $currentYear = (int) date('Y'); - if ($year < 2020 || $year > $currentYear + 1) { - throw new \InvalidArgumentException("Invalid year: {$year}"); - } - } - - /** - * Initialisiert Datums-Objekt - */ - private function initializeDate(int $month, int $year): void - { - $this->date = new stdClass(); - $date = Carbon::parse($year . '-' . $month . '-1'); - $this->date->month = $month; - $this->date->year = $year; - $this->date->start_date = $date->format('Y-m-d H:i:s'); - $this->date->end_date = $date->endOfMonth()->format('Y-m-d H:i:s'); - } - - /** - * Lädt gespeicherte Struktur - */ - private function loadStoredStructure(UserBusinessStructure $structure): void - { - $this->loadStoredRootUsers($structure); - $this->loadStoredParentsUsers($structure); - $this->loadStoredParentlessUsers($structure); - } - - /** - * Baut frische Struktur auf - */ - private function buildFreshStructure(): void - { - $this->loadRootUsers(); - $this->loadParentsUsers(); - $this->loadParentlessUsers(); - } - - /** - * Lädt Root-Users (optimiert mit Memory-Monitoring) - */ - private function loadRootUsers(): void - { - $startMemory = memory_get_usage(); - $users = $this->repository->getRootUsers(); - - foreach ($users as $user) { - // Memory-Check vor jeder User-Verarbeitung - $this->checkMemoryUsage('loadRootUsers', $user->id); - - $businessUserItem = new BusinessUserItemOptimized($this->date); - $businessUserItem->makeUserFromModel($user); // ✅ Nutzt bereits geladene Relations - $this->addUserIdToProcessed($user->id); - $this->businessUsers[] = $businessUserItem; - } - - $endMemory = memory_get_usage(); - $memoryUsed = $this->formatBytes($endMemory - $startMemory); - - $this->logger->info("Loaded " . count($users) . " root users with optimized relations. Memory used: {$memoryUsed}"); - } - - /** - * Lädt Parent-Users für alle Business-Users - */ - private function loadParentsUsers(): void - { - foreach ($this->businessUsers as $businessUser) { - $businessUser->readParentsBusinessUsers(); - } - } - - /** - * Lädt parentlose Users (Memory-optimiert) - */ - private function loadParentlessUsers(): void - { - $count = 0; - $excludeIds = array_keys($this->processedUserIds); - - foreach ($this->repository->getParentlessUsers($excludeIds) as $user) { - $businessUserItem = new BusinessUserItemOptimized($this->date); - $businessUserItem->makeUserFromModel($user); // ✅ Nutzt bereits geladene Relations - $this->parentless[] = $businessUserItem; - $count++; - } - - $this->logger->info("Loaded {$count} parentless users with optimized relations"); - } - - /** - * Lädt Sponsor für User - */ - private function loadSponsorUser(int $userId): void - { - try { - $sponsorUser = $this->repository->getSponsorForUser($userId); - - if ($sponsorUser) { - $this->sponsor = new BusinessUserItem($this->date); - $this->sponsor->makeUser($sponsorUser->id); - $this->logger->info("Loaded sponsor {$sponsorUser->id} for user {$userId}"); - } - } catch (\Exception $e) { - $this->logger->warning("Could not load sponsor for user {$userId}: " . $e->getMessage()); - } - } - - /** - * Gespeicherte Root-Users laden - */ - private function loadStoredRootUsers(UserBusinessStructure $structure): void - { - if (!$structure->structure) { - return; - } - - foreach ($structure->structure as $obj) { - $businessUserItem = new BusinessUserItem($this->date); - $businessUserItem->makeUser($obj->user_id); - $this->addUserIdToProcessed($obj->user_id); - $this->businessUsers[] = $businessUserItem; - } - } - - /** - * Gespeicherte Parent-Users laden - */ - private function loadStoredParentsUsers(UserBusinessStructure $structure): void - { - foreach ($this->businessUsers as $businessUser) { - $businessUser->readStoredParentsBusinessUsers($structure->structure); - } - } - - /** - * Gespeicherte parentlose Users laden - */ - private function loadStoredParentlessUsers(UserBusinessStructure $structure): void - { - if (!$structure->parentless) { - return; - } - - foreach ($structure->parentless as $obj) { - if (!isset($this->processedUserIds[$obj->user_id])) { - $businessUserItem = new BusinessUserItem($this->date); - $businessUserItem->makeUser($obj->user_id); - $this->parentless[] = $businessUserItem; - } - } - } - - /** - * Gespeicherten Sponsor laden - */ - private function loadStoredSponsorUser(int $userId): void - { - $this->sponsor = new BusinessUserItem($this->date); - $this->sponsor->makeUser($userId); - } - - /** - * Optimierte Punkte-Berechnung (Stack-basiert mit korrekter Depth-First Reihenfolge) - * - * KRITISCH: Stack muss gleiche Reihenfolge wie Original-Rekursion produzieren - * Original: Depth-First Traversierung (erst tief, dann Punkte addieren) - * Stack: Muss umgekehrt arbeiten - erst alle Kinder sammeln, dann von tief zu flach verarbeiten - */ - private function calculateUserPointsOptimized(array $businessUserItems, int $startLine): void - { - $processingStack = []; - $collectionStack = []; // Sammelt Items in korrekter Reihenfolge - - // Phase 1: Sammle alle Items in Depth-First Reihenfolge - foreach ($businessUserItems as $item) { - $collectionStack[] = ['item' => $item, 'line' => $startLine, 'depth' => 0]; - } - - // Expandiere alle Kinder (Depth-First) - $processedItems = []; - while (!empty($collectionStack)) { - $current = array_shift($collectionStack); // FIFO für Breadth-First Sammlung - $item = $current['item']; - $line = $current['line']; - $depth = $current['depth']; - - // Markiere für Verarbeitung (mit Tiefe für spätere Sortierung) - $processingStack[] = [ - 'item' => $item, - 'line' => $line, - 'depth' => $depth, - 'id' => $item->user_id ?? uniqid() - ]; - - // Füge Kinder hinzu (werden später verarbeitet = Depth-First) - if (isset($item->businessUserItems) && count($item->businessUserItems) > 0) { - // Kinder in umgekehrter Reihenfolge hinzufügen für korrekte Stack-Verarbeitung - $children = array_reverse($item->businessUserItems); - foreach ($children as $childItem) { - array_unshift($collectionStack, [ - 'item' => $childItem, - 'line' => $line + 1, - 'depth' => $depth + 1 - ]); - } - } - } - - // Phase 2: Sortiere nach Tiefe (tiefste zuerst, wie bei Rekursion) - usort($processingStack, function($a, $b) { - return $b['depth'] <=> $a['depth']; // Tiefste zuerst - }); - - // Phase 3: Verarbeite in korrekter Reihenfolge (von tief zu flach) - foreach ($processingStack as $current) { - $item = $current['item']; - $line = $current['line']; - - try { - // Business Line initialisieren falls nötig - if (!isset($this->businessUser->business_lines[$line])) { - $obj = new stdClass(); - $obj->points = 0; - $this->businessUser->addBusinessLineToUser($line, $obj); - } - - // Punkte hinzufügen (mit Validierung) - $points = (float) ($item->sales_volume_points_TP_sum ?? 0); - if ($points > 0) { - $this->businessUser->addBusinessLinePoints($line, $points); - $this->businessUser->addTotalTP($points); - } - - $this->logger->debug("Processed user {$current['id']} at line {$line} with {$points} points"); - - } catch (\Exception $e) { - $this->logger->error("Error processing user points for {$current['id']}: " . $e->getMessage()); - } - } - - $this->logger->info("Processed " . count($processingStack) . " business user items in depth-first order"); - } - - /** - * User-ID zu verarbeiteten IDs hinzufügen - */ - private function addUserIdToProcessed(int $id): void - { - $this->processedUserIds[$id] = true; - } - - /** - * Prüft ob User bereits verarbeitet wurde - */ - private function isUserProcessed(int $id): bool - { - return isset($this->processedUserIds[$id]); - } - - /** - * Memory-Monitoring Methoden - */ - private function checkMemoryUsage(string $operation, $identifier = null): void - { - $currentMemory = memory_get_usage(); - $memoryLimit = $this->parseMemoryLimit(ini_get('memory_limit')); - $memoryPercent = ($currentMemory / $memoryLimit) * 100; - - if ($memoryPercent > 80) { - $currentFormatted = $this->formatBytes($currentMemory); - $limitFormatted = $this->formatBytes($memoryLimit); - - $this->logger->warning("High memory usage detected in {$operation}", [ - 'identifier' => $identifier, - 'current_memory' => $currentFormatted, - 'memory_limit' => $limitFormatted, - 'usage_percent' => round($memoryPercent, 2) - ]); - - // Garbage Collection bei hohem Memory-Verbrauch - if ($memoryPercent > 90) { - $this->logger->warning("Critical memory usage - forcing garbage collection"); - gc_collect_cycles(); - } - } - } - - private function parseMemoryLimit(string $limit): int - { - $limit = trim($limit); - $last = strtolower($limit[strlen($limit)-1]); - $number = (int) $limit; - - switch($last) { - case 'g': $number *= 1024; - case 'm': $number *= 1024; - case 'k': $number *= 1024; - } - - return $number; - } - - private function formatBytes(int $bytes, int $precision = 2): string - { - $units = array('B', 'KB', 'MB', 'GB', 'TB'); - - for ($i = 0; $bytes > 1024 && $i < count($units) - 1; $i++) { - $bytes /= 1024; - } - - return round($bytes, $precision) . ' ' . $units[$i]; - } - - /** - * Public Properties für Rückwärtskompatibilität - */ - public function __get(string $name) - { - switch ($name) { - case 'date': - return $this->date; - case 'business_user': - return $this->businessUser; - case 'business_users': - return $this->businessUsers; - case 'parentless': - return $this->parentless; - default: - throw new \InvalidArgumentException("Property {$name} does not exist"); - } - } - - public function __set(string $name, $value) - { - switch ($name) { - case 'business_users': - $this->businessUsers = $value; - break; - case 'parentless': - $this->parentless = $value; - break; - default: - throw new \InvalidArgumentException("Property {$name} cannot be set"); - } - } -} \ No newline at end of file diff --git a/dev/subdomain-optimization/DomainService.php b/dev/subdomain-optimization/DomainService.php deleted file mode 100644 index 3567d642..00000000 --- a/dev/subdomain-optimization/DomainService.php +++ /dev/null @@ -1,272 +0,0 @@ -domainConfig = $this->loadDomainConfiguration(); - } - - /** - * Load domain configuration from config files - */ - private function loadDomainConfiguration(): array - { - return [ - 'main_domain' => config('app.domain'), - 'main_tld' => config('app.tld_care'), - 'shop_tld' => config('app.tld_shop'), - 'protocol' => config('app.protocol'), - 'subdomains' => [ - 'crm' => config('app.pre_url_crm', 'my.'), - 'portal' => config('app.pre_url_portal', 'in.'), - 'checkout' => config('app.pre_url_checkout', 'checkout.'), - ] - ]; - } - - /** - * Determine the type of subdomain - */ - public function getSubdomainType(string $subdomain): string - { - // Check if it's a fixed subdomain - if (in_array($subdomain, self::FIXED_SUBDOMAINS)) { - return match($subdomain) { - 'my' => 'crm', - 'in' => 'portal', - 'checkout' => 'checkout', - default => 'unknown' - }; - } - - // Check if it's a valid user shop - if ($this->isValidUserShop($subdomain)) { - return 'user-shop'; - } - - return 'unknown'; - } - - /** - * Check if a subdomain represents a valid user shop - */ - public function isValidUserShop(string $slug): bool - { - $cacheKey = "user_shop_valid_{$slug}"; - - return Cache::remember($cacheKey, self::CACHE_TTL, function () use ($slug) { - $userShop = UserShop::where('slug', $slug)->first(); - - if (!$userShop) { - return false; - } - - if (!$userShop->active) { - return false; - } - - if (!$userShop->user) { - return false; - } - - if (!$userShop->user->isActiveShop()) { - return false; - } - - return true; - }); - } - - /** - * Get user shop by slug with caching - */ - public function getUserShop(string $slug): ?UserShop - { - if (!$this->isValidUserShop($slug)) { - return null; - } - - $cacheKey = "user_shop_{$slug}"; - - return Cache::remember($cacheKey, self::CACHE_TTL, function () use ($slug) { - return UserShop::where('slug', $slug) - ->with('user') - ->first(); - }); - } - - /** - * Parse domain from request and determine context - */ - public function parseDomain(string $host): array - { - $parts = explode('.', $host); - - // Handle different TLD scenarios - if (count($parts) < 2) { - return [ - 'type' => 'invalid', - 'domain' => $host, - 'subdomain' => null, - 'tld' => null - ]; - } - - // Extract TLD and domain - $tld = '.' . end($parts); - $domain = $parts[count($parts) - 2]; - - // Check for subdomain - $subdomain = null; - if (count($parts) > 2) { - $subdomain = $parts[0]; - } - - // Determine domain type - $type = $this->determineDomainType($domain, $subdomain, $tld); - - return [ - 'type' => $type, - 'domain' => $domain, - 'subdomain' => $subdomain, - 'tld' => $tld, - 'full_domain' => $host - ]; - } - - /** - * Determine domain type based on domain, subdomain, and TLD - */ - private function determineDomainType(string $domain, ?string $subdomain, string $tld): string - { - // Check if it's the main domain - if ($domain === $this->domainConfig['main_domain']) { - if ($subdomain === null) { - // Main domain without subdomain - if ($tld === $this->domainConfig['shop_tld']) { - return 'main-shop'; // mivita.shop - } - return 'main'; // mivita.care - } - - // Main domain with subdomain - return $this->getSubdomainType($subdomain); - } - - return 'unknown'; - } - - /** - * Build URL for specific domain type - */ - public function buildUrl(string $type, ?string $path = null, ?string $slug = null): string - { - $base = $this->domainConfig['protocol']; - - switch ($type) { - case 'main': - $base .= $this->domainConfig['main_domain'] . $this->domainConfig['main_tld']; - break; - - case 'main-shop': - $base .= $this->domainConfig['main_domain'] . $this->domainConfig['shop_tld']; - break; - - case 'crm': - $base .= rtrim($this->domainConfig['subdomains']['crm'], '.') . - $this->domainConfig['main_domain'] . $this->domainConfig['main_tld']; - break; - - case 'portal': - $base .= rtrim($this->domainConfig['subdomains']['portal'], '.') . - $this->domainConfig['main_domain'] . $this->domainConfig['main_tld']; - break; - - case 'checkout': - $base .= rtrim($this->domainConfig['subdomains']['checkout'], '.') . - $this->domainConfig['main_domain'] . $this->domainConfig['main_tld']; - break; - - case 'user-shop': - if (!$slug) { - throw new \InvalidArgumentException('Slug required for user-shop URLs'); - } - $base .= $slug . '.' . $this->domainConfig['main_domain'] . $this->domainConfig['main_tld']; - break; - - default: - throw new \InvalidArgumentException("Unknown domain type: {$type}"); - } - - if ($path) { - $base .= '/' . ltrim($path, '/'); - } - - return $base; - } - - /** - * Get domain configuration - */ - public function getDomainConfiguration(): array - { - return $this->domainConfig; - } - - /** - * Clear user shop cache - */ - public function clearUserShopCache(string $slug): void - { - Cache::forget("user_shop_valid_{$slug}"); - Cache::forget("user_shop_{$slug}"); - } - - /** - * Get default user shop for main domain (fallback) - */ - public function getDefaultUserShop(): ?UserShop - { - return $this->getUserShop('aloevera'); // Current hardcoded fallback - } - - /** - * Validate domain configuration - */ - public function validateConfiguration(): array - { - $errors = []; - - if (empty($this->domainConfig['main_domain'])) { - $errors[] = 'Main domain not configured'; - } - - if (empty($this->domainConfig['main_tld'])) { - $errors[] = 'Main TLD not configured'; - } - - if (empty($this->domainConfig['protocol'])) { - $errors[] = 'Protocol not configured'; - } - - return $errors; - } -} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..7869eac3 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,121 @@ +services: + laravel.test: + build: + context: './docker/8.4' + dockerfile: Dockerfile + args: + WWWGROUP: '${WWWGROUP}' + image: 'sail-8.4/app' + extra_hosts: + - 'host.docker.internal:host-gateway' + ports: + # - '${APP_PORT:-80}:80' + - '${VITE_PORT:-5173}:${VITE_PORT:-5173}' + environment: + WWWUSER: '${WWWUSER}' + LARAVEL_SAIL: 1 + XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}' + XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}' + IGNITION_LOCAL_SITES_PATH: '${PWD}' + volumes: + - '.:/var/www/html' + networks: + - sail + - proxy + depends_on: + - mysql + - redis + - mailpit + labels: + - "traefik.enable=true" + # Hauptdomain + - "traefik.http.routers.mivita.rule=Host(`mivita.test`)" + - "traefik.http.routers.mivita.entrypoints=websecure" + - "traefik.http.routers.mivita.tls=true" + - "traefik.http.routers.mivita.service=mivita-service" + # Wildcard für alle Subdomains - WICHTIG: Gleicher Service! + - "traefik.http.routers.mivita-sub.rule=HostRegexp(`^.+\\.mivita\\.test$`)" + - "traefik.http.routers.mivita-sub.entrypoints=websecure" + - "traefik.http.routers.mivita-sub.tls=true" + - "traefik.http.routers.mivita-sub.service=mivita-service" + - "traefik.http.routers.mivita-sub.priority=10" + # Service Definition - NUR EINMAL! + - "traefik.http.services.mivita-service.loadbalancer.server.port=80" + - "traefik.docker.network=proxy" + horizon: + image: sail-8.4/app + container_name: mivita-horizon-1 + restart: unless-stopped + command: php /var/www/html/artisan horizon + volumes: + - '.:/var/www/html' + networks: + - sail + depends_on: + - mysql + - redis + mysql: + image: 'mysql/mysql-server:8.0' + ports: + - '${FORWARD_DB_PORT:-33061}:3306' + environment: + MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' + MYSQL_ROOT_HOST: '%' + MYSQL_DATABASE: '${DB_DATABASE}' + MYSQL_USER: '${DB_USERNAME}' + MYSQL_PASSWORD: '${DB_PASSWORD}' + MYSQL_ALLOW_EMPTY_PASSWORD: 1 + MYSQL_EXTRA_OPTIONS: '${MYSQL_EXTRA_OPTIONS}' + volumes: + - 'sail-mysql:/var/lib/mysql' + - './docker/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh' + networks: + - sail + healthcheck: + test: + - CMD + - mysqladmin + - ping + - '-p${DB_PASSWORD}' + retries: 3 + timeout: 5s + redis: + image: 'redis:alpine' + ports: + - '${FORWARD_REDIS_PORT:-6379}:6379' + volumes: + - 'sail-redis:/data' + networks: + - sail + healthcheck: + test: + - CMD + - redis-cli + - ping + retries: 3 + timeout: 5s + mailpit: + image: 'axllent/mailpit:latest' + ports: + - '${FORWARD_MAILPIT_PORT:-1025}:1025' + - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025' + networks: + - sail + - proxy + labels: + - "traefik.enable=true" + - "traefik.http.routers.mivita-mail.rule=Host(`mivita-mail.test`)" + - "traefik.http.routers.mivita-mail.entrypoints=websecure" + - "traefik.http.routers.mivita-mail.tls=true" + - "traefik.http.services.mivita-mail.loadbalancer.server.port=8025" + - "traefik.docker.network=proxy" +networks: + sail: + driver: bridge + proxy: + external: true +volumes: + sail-mysql: + driver: local + sail-redis: + driver: local diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile new file mode 100644 index 00000000..b7b34e27 --- /dev/null +++ b/docker/8.0/Dockerfile @@ -0,0 +1,70 @@ +FROM ubuntu:24.04 + +LABEL maintainer="Taylor Otwell" + +ARG WWWGROUP +ARG NODE_VERSION=22 +ARG POSTGRES_VERSION=17 + +WORKDIR /var/www/html + +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=UTC +ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80" +ENV SUPERVISOR_PHP_USER="sail" + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::http::No-Cache true;" >> /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::BrokenProxy true;" >> /etc/apt/apt.conf.d/99custom + +RUN apt-get update && apt-get upgrade -y \ + && mkdir -p /etc/apt/keyrings \ + && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \ + && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb8dc7e53946656efbce4c1dd71daeaab4ad4cab6' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ + && apt-get update \ + && apt-get install -y php8.0-cli php8.0-dev \ + php8.0-pgsql php8.0-sqlite3 php8.0-gd php8.0-imagick \ + php8.0-curl php8.0-memcached php8.0-mongodb \ + php8.0-imap php8.0-mysql php8.0-mbstring \ + php8.0-xml php8.0-zip php8.0-bcmath php8.0-soap \ + php8.0-intl php8.0-readline php8.0-pcov \ + php8.0-msgpack php8.0-igbinary php8.0-ldap \ + php8.0-redis php8.0-swoole php8.0-xdebug \ + && curl -sLS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get install -y nodejs \ + && npm install -g npm \ + && npm install -g bun \ + && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/pgdg.gpg >/dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && apt-get update \ + && apt-get install -y yarn \ + && apt-get install -y mysql-client \ + && apt-get install -y postgresql-client-$POSTGRES_VERSION \ + && apt-get -y autoremove \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN update-alternatives --set php /usr/bin/php8.0 + +RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.0 + +RUN userdel -r ubuntu +RUN groupadd --force -g $WWWGROUP sail +RUN useradd -ms /bin/bash --no-user-group -g $WWWGROUP -u 1337 sail + +COPY start-container /usr/local/bin/start-container +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY php.ini /etc/php/8.0/cli/conf.d/99-sail.ini +RUN chmod +x /usr/local/bin/start-container + +EXPOSE 80/tcp + +ENTRYPOINT ["start-container"] diff --git a/docker/8.0/php.ini b/docker/8.0/php.ini new file mode 100644 index 00000000..0d8ce9e2 --- /dev/null +++ b/docker/8.0/php.ini @@ -0,0 +1,5 @@ +[PHP] +post_max_size = 100M +upload_max_filesize = 100M +variables_order = EGPCS +pcov.directory = . diff --git a/docker/8.0/start-container b/docker/8.0/start-container new file mode 100644 index 00000000..40c55dfe --- /dev/null +++ b/docker/8.0/start-container @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +if [ "$SUPERVISOR_PHP_USER" != "root" ] && [ "$SUPERVISOR_PHP_USER" != "sail" ]; then + echo "You should set SUPERVISOR_PHP_USER to either 'sail' or 'root'." + exit 1 +fi + +if [ ! -z "$WWWUSER" ]; then + usermod -u $WWWUSER sail +fi + +if [ ! -d /.composer ]; then + mkdir /.composer +fi + +chmod -R ugo+rw /.composer + +if [ $# -gt 0 ]; then + if [ "$SUPERVISOR_PHP_USER" = "root" ]; then + exec "$@" + else + exec gosu $WWWUSER "$@" + fi +else + exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf +fi diff --git a/docker/8.0/supervisord.conf b/docker/8.0/supervisord.conf new file mode 100644 index 00000000..656da8a9 --- /dev/null +++ b/docker/8.0/supervisord.conf @@ -0,0 +1,14 @@ +[supervisord] +nodaemon=true +user=root +logfile=/var/log/supervisor/supervisord.log +pidfile=/var/run/supervisord.pid + +[program:php] +command=%(ENV_SUPERVISOR_PHP_COMMAND)s +user=%(ENV_SUPERVISOR_PHP_USER)s +environment=LARAVEL_SAIL="1" +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/8.1/Dockerfile b/docker/8.1/Dockerfile new file mode 100644 index 00000000..cc5c6114 --- /dev/null +++ b/docker/8.1/Dockerfile @@ -0,0 +1,69 @@ +FROM ubuntu:24.04 + +LABEL maintainer="Taylor Otwell" + +ARG WWWGROUP +ARG NODE_VERSION=22 +ARG POSTGRES_VERSION=17 + +WORKDIR /var/www/html + +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=UTC +ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80" +ENV SUPERVISOR_PHP_USER="sail" + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::http::No-Cache true;" >> /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::BrokenProxy true;" >> /etc/apt/apt.conf.d/99custom + +RUN apt-get update && apt-get upgrade -y \ + && mkdir -p /etc/apt/keyrings \ + && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \ + && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb8dc7e53946656efbce4c1dd71daeaab4ad4cab6' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ + && apt-get update \ + && apt-get install -y php8.1-cli php8.1-dev \ + php8.1-pgsql php8.1-sqlite3 php8.1-gd php8.1-imagick \ + php8.1-curl php8.1-mongodb \ + php8.1-imap php8.1-mysql php8.1-mbstring \ + php8.1-xml php8.1-zip php8.1-bcmath php8.1-soap \ + php8.1-intl php8.1-readline \ + php8.1-ldap \ + php8.1-msgpack php8.1-igbinary php8.1-redis php8.1-swoole \ + php8.1-memcached php8.1-pcov php8.1-xdebug \ + && curl -sLS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get install -y nodejs \ + && npm install -g npm \ + && npm install -g bun \ + && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarn.gpg >/dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/pgdg.gpg >/dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && apt-get update \ + && apt-get install -y yarn \ + && apt-get install -y mysql-client \ + && apt-get install -y postgresql-client-$POSTGRES_VERSION \ + && apt-get -y autoremove \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.1 + +RUN userdel -r ubuntu +RUN groupadd --force -g $WWWGROUP sail +RUN useradd -ms /bin/bash --no-user-group -g $WWWGROUP -u 1337 sail + +COPY start-container /usr/local/bin/start-container +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY php.ini /etc/php/8.1/cli/conf.d/99-sail.ini +RUN chmod +x /usr/local/bin/start-container + +EXPOSE 80/tcp + +ENTRYPOINT ["start-container"] diff --git a/docker/8.1/php.ini b/docker/8.1/php.ini new file mode 100644 index 00000000..0d8ce9e2 --- /dev/null +++ b/docker/8.1/php.ini @@ -0,0 +1,5 @@ +[PHP] +post_max_size = 100M +upload_max_filesize = 100M +variables_order = EGPCS +pcov.directory = . diff --git a/docker/8.1/start-container b/docker/8.1/start-container new file mode 100644 index 00000000..40c55dfe --- /dev/null +++ b/docker/8.1/start-container @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +if [ "$SUPERVISOR_PHP_USER" != "root" ] && [ "$SUPERVISOR_PHP_USER" != "sail" ]; then + echo "You should set SUPERVISOR_PHP_USER to either 'sail' or 'root'." + exit 1 +fi + +if [ ! -z "$WWWUSER" ]; then + usermod -u $WWWUSER sail +fi + +if [ ! -d /.composer ]; then + mkdir /.composer +fi + +chmod -R ugo+rw /.composer + +if [ $# -gt 0 ]; then + if [ "$SUPERVISOR_PHP_USER" = "root" ]; then + exec "$@" + else + exec gosu $WWWUSER "$@" + fi +else + exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf +fi diff --git a/docker/8.1/supervisord.conf b/docker/8.1/supervisord.conf new file mode 100644 index 00000000..656da8a9 --- /dev/null +++ b/docker/8.1/supervisord.conf @@ -0,0 +1,14 @@ +[supervisord] +nodaemon=true +user=root +logfile=/var/log/supervisor/supervisord.log +pidfile=/var/run/supervisord.pid + +[program:php] +command=%(ENV_SUPERVISOR_PHP_COMMAND)s +user=%(ENV_SUPERVISOR_PHP_USER)s +environment=LARAVEL_SAIL="1" +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/8.2/Dockerfile b/docker/8.2/Dockerfile new file mode 100644 index 00000000..536dffe1 --- /dev/null +++ b/docker/8.2/Dockerfile @@ -0,0 +1,70 @@ +FROM ubuntu:24.04 + +LABEL maintainer="Taylor Otwell" + +ARG WWWGROUP +ARG NODE_VERSION=22 +ARG POSTGRES_VERSION=17 + +WORKDIR /var/www/html + +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=UTC +ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80" +ENV SUPERVISOR_PHP_USER="sail" + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::http::No-Cache true;" >> /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::BrokenProxy true;" >> /etc/apt/apt.conf.d/99custom + +RUN apt-get update && apt-get upgrade -y \ + && mkdir -p /etc/apt/keyrings \ + && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \ + && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb8dc7e53946656efbce4c1dd71daeaab4ad4cab6' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ + && apt-get update \ + && apt-get install -y php8.2-cli php8.2-dev \ + php8.2-pgsql php8.2-sqlite3 php8.2-gd php8.2-imagick \ + php8.2-curl php8.2-mongodb \ + php8.2-imap php8.2-mysql php8.2-mbstring \ + php8.2-xml php8.2-zip php8.2-bcmath php8.2-soap \ + php8.2-intl php8.2-readline \ + php8.2-ldap \ + php8.2-msgpack php8.2-igbinary php8.2-redis php8.2-swoole \ + php8.2-memcached php8.2-pcov php8.2-xdebug \ + && curl -sLS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get install -y nodejs \ + && npm install -g npm \ + && npm install -g pnpm \ + && npm install -g bun \ + && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/keyrings/yarn.gpg >/dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && apt-get update \ + && apt-get install -y yarn \ + && apt-get install -y mysql-client \ + && apt-get install -y postgresql-client-$POSTGRES_VERSION \ + && apt-get -y autoremove \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.2 + +RUN userdel -r ubuntu +RUN groupadd --force -g $WWWGROUP sail +RUN useradd -ms /bin/bash --no-user-group -g $WWWGROUP -u 1337 sail + +COPY start-container /usr/local/bin/start-container +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY php.ini /etc/php/8.2/cli/conf.d/99-sail.ini +RUN chmod +x /usr/local/bin/start-container + +EXPOSE 80/tcp + +ENTRYPOINT ["start-container"] diff --git a/docker/8.2/php.ini b/docker/8.2/php.ini new file mode 100644 index 00000000..0d8ce9e2 --- /dev/null +++ b/docker/8.2/php.ini @@ -0,0 +1,5 @@ +[PHP] +post_max_size = 100M +upload_max_filesize = 100M +variables_order = EGPCS +pcov.directory = . diff --git a/docker/8.2/start-container b/docker/8.2/start-container new file mode 100644 index 00000000..40c55dfe --- /dev/null +++ b/docker/8.2/start-container @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +if [ "$SUPERVISOR_PHP_USER" != "root" ] && [ "$SUPERVISOR_PHP_USER" != "sail" ]; then + echo "You should set SUPERVISOR_PHP_USER to either 'sail' or 'root'." + exit 1 +fi + +if [ ! -z "$WWWUSER" ]; then + usermod -u $WWWUSER sail +fi + +if [ ! -d /.composer ]; then + mkdir /.composer +fi + +chmod -R ugo+rw /.composer + +if [ $# -gt 0 ]; then + if [ "$SUPERVISOR_PHP_USER" = "root" ]; then + exec "$@" + else + exec gosu $WWWUSER "$@" + fi +else + exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf +fi diff --git a/docker/8.2/supervisord.conf b/docker/8.2/supervisord.conf new file mode 100644 index 00000000..656da8a9 --- /dev/null +++ b/docker/8.2/supervisord.conf @@ -0,0 +1,14 @@ +[supervisord] +nodaemon=true +user=root +logfile=/var/log/supervisor/supervisord.log +pidfile=/var/run/supervisord.pid + +[program:php] +command=%(ENV_SUPERVISOR_PHP_COMMAND)s +user=%(ENV_SUPERVISOR_PHP_USER)s +environment=LARAVEL_SAIL="1" +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/8.3/Dockerfile b/docker/8.3/Dockerfile new file mode 100644 index 00000000..ef5904bb --- /dev/null +++ b/docker/8.3/Dockerfile @@ -0,0 +1,71 @@ +FROM ubuntu:24.04 + +LABEL maintainer="Taylor Otwell" + +ARG WWWGROUP +ARG NODE_VERSION=22 +ARG MYSQL_CLIENT="mysql-client" +ARG POSTGRES_VERSION=17 + +WORKDIR /var/www/html + +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=UTC +ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80" +ENV SUPERVISOR_PHP_USER="sail" + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::http::No-Cache true;" >> /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::BrokenProxy true;" >> /etc/apt/apt.conf.d/99custom + +RUN apt-get update && apt-get upgrade -y \ + && mkdir -p /etc/apt/keyrings \ + && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \ + && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb8dc7e53946656efbce4c1dd71daeaab4ad4cab6' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ + && apt-get update \ + && apt-get install -y php8.3-cli php8.3-dev \ + php8.3-pgsql php8.3-sqlite3 php8.3-gd \ + php8.3-curl php8.3-mongodb \ + php8.3-imap php8.3-mysql php8.3-mbstring \ + php8.3-xml php8.3-zip php8.3-bcmath php8.3-soap \ + php8.3-intl php8.3-readline \ + php8.3-ldap \ + php8.3-msgpack php8.3-igbinary php8.3-redis \ + php8.3-memcached php8.3-pcov php8.3-imagick php8.3-xdebug php8.3-swoole \ + && curl -sLS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get install -y nodejs \ + && npm install -g npm \ + && npm install -g pnpm \ + && npm install -g bun \ + && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/keyrings/yarn.gpg >/dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && apt-get update \ + && apt-get install -y yarn \ + && apt-get install -y $MYSQL_CLIENT \ + && apt-get install -y postgresql-client-$POSTGRES_VERSION \ + && apt-get -y autoremove \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.3 + +RUN userdel -r ubuntu +RUN groupadd --force -g $WWWGROUP sail +RUN useradd -ms /bin/bash --no-user-group -g $WWWGROUP -u 1337 sail + +COPY start-container /usr/local/bin/start-container +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY php.ini /etc/php/8.3/cli/conf.d/99-sail.ini +RUN chmod +x /usr/local/bin/start-container + +EXPOSE 80/tcp + +ENTRYPOINT ["start-container"] diff --git a/docker/8.3/php.ini b/docker/8.3/php.ini new file mode 100644 index 00000000..0d8ce9e2 --- /dev/null +++ b/docker/8.3/php.ini @@ -0,0 +1,5 @@ +[PHP] +post_max_size = 100M +upload_max_filesize = 100M +variables_order = EGPCS +pcov.directory = . diff --git a/docker/8.3/start-container b/docker/8.3/start-container new file mode 100644 index 00000000..40c55dfe --- /dev/null +++ b/docker/8.3/start-container @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +if [ "$SUPERVISOR_PHP_USER" != "root" ] && [ "$SUPERVISOR_PHP_USER" != "sail" ]; then + echo "You should set SUPERVISOR_PHP_USER to either 'sail' or 'root'." + exit 1 +fi + +if [ ! -z "$WWWUSER" ]; then + usermod -u $WWWUSER sail +fi + +if [ ! -d /.composer ]; then + mkdir /.composer +fi + +chmod -R ugo+rw /.composer + +if [ $# -gt 0 ]; then + if [ "$SUPERVISOR_PHP_USER" = "root" ]; then + exec "$@" + else + exec gosu $WWWUSER "$@" + fi +else + exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf +fi diff --git a/docker/8.3/supervisord.conf b/docker/8.3/supervisord.conf new file mode 100644 index 00000000..656da8a9 --- /dev/null +++ b/docker/8.3/supervisord.conf @@ -0,0 +1,14 @@ +[supervisord] +nodaemon=true +user=root +logfile=/var/log/supervisor/supervisord.log +pidfile=/var/run/supervisord.pid + +[program:php] +command=%(ENV_SUPERVISOR_PHP_COMMAND)s +user=%(ENV_SUPERVISOR_PHP_USER)s +environment=LARAVEL_SAIL="1" +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/8.4/Dockerfile b/docker/8.4/Dockerfile new file mode 100644 index 00000000..cb0fbdc1 --- /dev/null +++ b/docker/8.4/Dockerfile @@ -0,0 +1,71 @@ +FROM ubuntu:24.04 + +LABEL maintainer="Taylor Otwell" + +ARG WWWGROUP +ARG NODE_VERSION=22 +ARG MYSQL_CLIENT="mysql-client" +ARG POSTGRES_VERSION=17 + +WORKDIR /var/www/html + +ENV DEBIAN_FRONTEND=noninteractive +ENV TZ=UTC +ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80" +ENV SUPERVISOR_PHP_USER="sail" + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::http::No-Cache true;" >> /etc/apt/apt.conf.d/99custom && \ + echo "Acquire::BrokenProxy true;" >> /etc/apt/apt.conf.d/99custom + +RUN apt-get update && apt-get upgrade -y \ + && mkdir -p /etc/apt/keyrings \ + && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano \ + && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xb8dc7e53946656efbce4c1dd71daeaab4ad4cab6' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ + && apt-get update \ + && apt-get install -y php8.4-cli php8.4-dev \ + php8.4-pgsql php8.4-sqlite3 php8.4-gd \ + php8.4-curl php8.4-mongodb \ + php8.4-imap php8.4-mysql php8.4-mbstring \ + php8.4-xml php8.4-zip php8.4-bcmath php8.4-soap \ + php8.4-intl php8.4-readline \ + php8.4-ldap \ + php8.4-msgpack php8.4-igbinary php8.4-redis php8.4-swoole \ + php8.4-memcached php8.4-pcov php8.4-imagick php8.4-xdebug \ + && curl -sLS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get install -y nodejs \ + && npm install -g npm \ + && npm install -g pnpm \ + && npm install -g bun \ + && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/keyrings/yarn.gpg >/dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ + && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \ + && echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt noble-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && apt-get update \ + && apt-get install -y yarn \ + && apt-get install -y $MYSQL_CLIENT \ + && apt-get install -y postgresql-client-$POSTGRES_VERSION \ + && apt-get -y autoremove \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.4 + +RUN userdel -r ubuntu +RUN groupadd --force -g $WWWGROUP sail +RUN useradd -ms /bin/bash --no-user-group -g $WWWGROUP -u 1337 sail + +COPY start-container /usr/local/bin/start-container +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY php.ini /etc/php/8.4/cli/conf.d/99-sail.ini +RUN chmod +x /usr/local/bin/start-container + +EXPOSE 80/tcp + +ENTRYPOINT ["start-container"] diff --git a/docker/8.4/php.ini b/docker/8.4/php.ini new file mode 100644 index 00000000..0d8ce9e2 --- /dev/null +++ b/docker/8.4/php.ini @@ -0,0 +1,5 @@ +[PHP] +post_max_size = 100M +upload_max_filesize = 100M +variables_order = EGPCS +pcov.directory = . diff --git a/docker/8.4/start-container b/docker/8.4/start-container new file mode 100644 index 00000000..40c55dfe --- /dev/null +++ b/docker/8.4/start-container @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +if [ "$SUPERVISOR_PHP_USER" != "root" ] && [ "$SUPERVISOR_PHP_USER" != "sail" ]; then + echo "You should set SUPERVISOR_PHP_USER to either 'sail' or 'root'." + exit 1 +fi + +if [ ! -z "$WWWUSER" ]; then + usermod -u $WWWUSER sail +fi + +if [ ! -d /.composer ]; then + mkdir /.composer +fi + +chmod -R ugo+rw /.composer + +if [ $# -gt 0 ]; then + if [ "$SUPERVISOR_PHP_USER" = "root" ]; then + exec "$@" + else + exec gosu $WWWUSER "$@" + fi +else + exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf +fi diff --git a/docker/8.4/supervisord.conf b/docker/8.4/supervisord.conf new file mode 100644 index 00000000..656da8a9 --- /dev/null +++ b/docker/8.4/supervisord.conf @@ -0,0 +1,14 @@ +[supervisord] +nodaemon=true +user=root +logfile=/var/log/supervisor/supervisord.log +pidfile=/var/run/supervisord.pid + +[program:php] +command=%(ENV_SUPERVISOR_PHP_COMMAND)s +user=%(ENV_SUPERVISOR_PHP_USER)s +environment=LARAVEL_SAIL="1" +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/docker/mariadb/create-testing-database.sh b/docker/mariadb/create-testing-database.sh new file mode 100644 index 00000000..d3b19d90 --- /dev/null +++ b/docker/mariadb/create-testing-database.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +/usr/bin/mariadb --user=root --password="$MYSQL_ROOT_PASSWORD" <<-EOSQL + CREATE DATABASE IF NOT EXISTS testing; + GRANT ALL PRIVILEGES ON \`testing%\`.* TO '$MYSQL_USER'@'%'; +EOSQL diff --git a/docker/mysql/create-testing-database.sh b/docker/mysql/create-testing-database.sh new file mode 100644 index 00000000..aeb1826f --- /dev/null +++ b/docker/mysql/create-testing-database.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +mysql --user=root --password="$MYSQL_ROOT_PASSWORD" <<-EOSQL + CREATE DATABASE IF NOT EXISTS testing; + GRANT ALL PRIVILEGES ON \`testing%\`.* TO '$MYSQL_USER'@'%'; +EOSQL diff --git a/docker/pgsql/create-testing-database.sql b/docker/pgsql/create-testing-database.sql new file mode 100644 index 00000000..d84dc07b --- /dev/null +++ b/docker/pgsql/create-testing-database.sql @@ -0,0 +1,2 @@ +SELECT 'CREATE DATABASE testing' +WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'testing')\gexec diff --git a/mivita.code-workspace b/mivita.code-workspace index 29881eba..362d7c25 100644 --- a/mivita.code-workspace +++ b/mivita.code-workspace @@ -3,8 +3,5 @@ { "path": "." } - ], - "settings": { - "CodeGPT.apiKey": "CodeGPT Plus Beta" - } + ] } \ No newline at end of file diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_shipments_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_shipments_table.php deleted file mode 100644 index f266ba88..00000000 --- a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000000_create_shipments_table.php +++ /dev/null @@ -1,29 +0,0 @@ -id(); - $t->unsignedBigInteger('order_id')->nullable(); - $t->string('carrier')->default('dhl'); - $t->string('dhl_shipment_no')->nullable()->index(); - $t->string('product_code')->nullable(); - $t->string('billing_number')->nullable(); - $t->decimal('weight_kg', 8, 3)->nullable(); - $t->string('status')->default('created'); - $t->string('label_format')->nullable(); - $t->string('label_path')->nullable(); - $t->json('meta')->nullable(); - $t->timestamps(); - }); - } - public function down(): void - { - Schema::dropIfExists('shipments'); - } -}; diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000100_create_shipment_labels_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000100_create_shipment_labels_table.php deleted file mode 100644 index 7f6270a3..00000000 --- a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000100_create_shipment_labels_table.php +++ /dev/null @@ -1,22 +0,0 @@ -id(); - $t->foreignId('shipment_id')->constrained('shipments')->cascadeOnDelete(); - $t->string('format')->default('PDF'); - $t->string('path'); - $t->timestamps(); - }); - } - public function down(): void - { - Schema::dropIfExists('shipment_labels'); - } -}; diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_tracking_events_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_tracking_events_table.php deleted file mode 100644 index a736351a..00000000 --- a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000200_create_tracking_events_table.php +++ /dev/null @@ -1,24 +0,0 @@ -id(); - $t->foreignId('shipment_id')->constrained('shipments')->cascadeOnDelete(); - $t->string('status_code')->nullable(); - $t->string('status_text')->nullable(); - $t->string('location')->nullable(); - $t->timestamp('event_time')->nullable(); - $t->json('raw')->nullable(); - }); - } - public function down(): void - { - Schema::dropIfExists('tracking_events'); - } -}; diff --git a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000300_create_return_labels_table.php b/packages/acme-laravel-dhl/database/migrations/2025_01_01_000300_create_return_labels_table.php deleted file mode 100644 index 057a2333..00000000 --- a/packages/acme-laravel-dhl/database/migrations/2025_01_01_000300_create_return_labels_table.php +++ /dev/null @@ -1,22 +0,0 @@ -id(); - $t->unsignedBigInteger('order_id')->nullable()->index(); - $t->string('dhl_return_no')->nullable()->index(); - $t->string('label_path')->nullable(); - $t->timestamps(); - }); - } - public function down(): void - { - Schema::dropIfExists('return_labels'); - } -}; diff --git a/packages/acme-laravel-dhl/src/Models/ReturnLabel.php b/packages/acme-laravel-dhl/src/Models/ReturnLabel.php deleted file mode 100644 index 9bf910cc..00000000 --- a/packages/acme-laravel-dhl/src/Models/ReturnLabel.php +++ /dev/null @@ -1,10 +0,0 @@ -belongsTo(Shipment::class); - } -} diff --git a/packages/acme-laravel-dhl/src/Models/TrackingEvent.php b/packages/acme-laravel-dhl/src/Models/TrackingEvent.php deleted file mode 100644 index 925f3f00..00000000 --- a/packages/acme-laravel-dhl/src/Models/TrackingEvent.php +++ /dev/null @@ -1,16 +0,0 @@ - 'array', 'event_time' => 'datetime',]; - public function shipment() - { - return $this->belongsTo(Shipment::class); - } -} diff --git a/packages/laravel-collective-spatie-html-parser/.vscode/settings.json b/packages/laravel-collective-spatie-html-parser/.vscode/settings.json new file mode 100644 index 00000000..6c2ff60b --- /dev/null +++ b/packages/laravel-collective-spatie-html-parser/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "master" + ] +} \ No newline at end of file diff --git a/public/phpinfo.php b/public/phpinfo.php new file mode 100644 index 00000000..d7c34698 --- /dev/null +++ b/public/phpinfo.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/resources/lang/en.json b/resources/lang/en.json index 2c84d076..c31a5b05 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -1,6 +1,7 @@ { "MR": "Mr", "MS": "Ms", + "DIV": "Various", "please select": "please choose", "please specify": "Please specify.", "further countries": "more countrys", diff --git a/resources/lang/es.json b/resources/lang/es.json index 7b8a96a4..2920f422 100644 --- a/resources/lang/es.json +++ b/resources/lang/es.json @@ -1,6 +1,7 @@ { "MR": "Sr.", "MS": "Sra.", + "DIV": "Varios", "please select": "seleccione", "please specify": "Especifíquelo.", "further countries": "otros paises", diff --git a/resources/views/admin/business/index.blade.php b/resources/views/admin/business/index.blade.php deleted file mode 100644 index 973b727e..00000000 --- a/resources/views/admin/business/index.blade.php +++ /dev/null @@ -1,109 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') -
-
- {{__('Business')}} -
- -
- {!! Form::open(['url' => route('admin_payments_invoice'), 'class' => 'form-horizontal', 'id'=>'form_filter_payment_invoices']) !!} - -
- {{--
- -
- --}} -
- -
-
- -
-
- {!! Form::close() !!} - -
- - - - - - - - - - - - - - - - - - - - - -
{{__('ID') }}{{__('Berater-ID') }}{{__('Points')}}{{__('Points Shop')}}{{__('Gesamt')}}{{__('Umsatz')}}{{__('Umsatz Shop')}}{{__('Gesamt Shop')}}{{__('E-Mail')}}{{__('Vorname')}}{{__('Nachname')}}{{__('Level')}}{{__('Mitglied')}}
-
-
- - -@endsection diff --git a/resources/views/admin/dhl/create.blade.php b/resources/views/admin/dhl/create.blade.php index 87baa81d..9caade92 100644 --- a/resources/views/admin/dhl/create.blade.php +++ b/resources/views/admin/dhl/create.blade.php @@ -31,9 +31,9 @@ Kunde: - {{ $order->user->first_name ?? '' }} {{ $order->user->last_name ?? '' }} + {{ $order->shopping_user->billing_firstname ?? '' }} {{ $order->shopping_user->billing_lastname ?? '' }}
- {{ $order->user->email ?? '' }} + {{ $order->shopping_user->billing_email ?? '' }} @@ -42,7 +42,7 @@ Bestellwert: - {{ number_format($order->order_total, 2) }} € + {{ number_format($order->total, 2) }} €
@@ -51,9 +51,9 @@ Lieferadresse: - {{ $order->shipping_first_name ?? $order->user->first_name }} {{ $order->shipping_last_name ?? $order->user->last_name }}
- {{ $order->shipping_street ?? $order->user->street }} {{ $order->shipping_house_number ?? $order->user->house_number }}
- {{ $order->shipping_postcode ?? $order->user->postcode }} {{ $order->shipping_city ?? $order->user->city }}
+ {{ $order->shopping_user->shipping_firstname ?? $order->shopping_user->billing_firstname }} {{ $order->shopping_user->shipping_lastname ?? $order->shopping_user->billing_lastname }}
+ {{ $order->shopping_user->shipping_address ?? $order->shopping_user->billing_address }} {{ $order->shopping_user->shipping_address_2 ?? $order->shopping_user->billing_address_2 }}
+ {{ $order->shopping_user->shipping_zipcode ?? $order->shopping_user->billing_zipcode }} {{ $order->shopping_user->shipping_city ?? $order->shopping_user->billing_city }}
{{ $order->shippingCountry->name ?? 'Deutschland' }} @@ -67,7 +67,7 @@ Artikel: - {{ $order->items->count() }} Artikel + {{ $order->shopping_order_items->count() }} Artikel @@ -97,7 +97,7 @@ @php $totalWeight = 0; @endphp - @foreach($order->items as $item) + @foreach($order->shopping_order_items as $item) @php $itemWeight = ($item->product->weight ?? 0) * $item->qty; $totalWeight += $itemWeight; diff --git a/resources/views/admin/product/_form.blade.php b/resources/views/admin/product/_form.blade.php deleted file mode 100755 index e4d3766b..00000000 --- a/resources/views/admin/product/_form.blade.php +++ /dev/null @@ -1,353 +0,0 @@ - -
- -
- {{ __('Produkt') }} - -
- -
- -
- - - {{ Form::text('name', $product->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }} -
-
- -
- - {{ Form::text('number', $product->number, array('placeholder'=>__('number'), 'class'=>'form-control', 'id'=>'number')) }} - -
-
- - {{ Form::text('ean', $product->ean, array('placeholder'=>__('EAN'), 'class'=>'form-control', 'id'=>'ean')) }} -
-
- -
-
- - -
- {{-- -
- - {{ Form::select('show_at', $product->showATs, $product->show_at, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_at') ) }} -
- --}} - -
- - {{ Form::text('pos', $product->pos, array('placeholder'=>__('1, 2, 3, etc'), 'class'=>'form-control', 'id'=>'pos')) }} -
-
-
-
- - {{ Form::select('show_on[]', $product->showONs, $product->show_on, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_on', 'multiple') ) }} -
-
-
- - {{ Form::textarea('copy', $product->copy , array('placeholder'=>__('Produktbeschreibung'), 'class'=>'form-control summernote', 'id'=>'copy')) }} -
- -
-
- -
-
- {{ __('Preise in EUR') }} -
-
-
-
- - {{ Form::text('price', $product->getFormattedPrice(), array('placeholder'=>__('Preis VK in EUR (Brutto)'), 'class'=>'form-control', 'id'=>'price')) }} - -
-
- - {{ Form::text('price_ek', $product->getFormattedPriceEk(), array('placeholder'=>__('Preis EK in EUR'), 'class'=>'form-control', 'id'=>'price_ek')) }} - -
-
- - {{ Form::text('tax', $product->getFormattedTax(), array('placeholder'=>__('MwSt in %'), 'class'=>'form-control', 'id'=>'tax')) }} - -
-
- - {{ Form::text('price_old', $product->getFormattedPriceOld(), array('placeholder'=>__('Streichpreis'), 'class'=>'form-control', 'id'=>'price_old')) }} - -
-
-
-
- - {{ Form::text('weight', $product->weight, array('placeholder'=>__('Gewicht in g'), 'class'=>'form-control', 'id'=>'weight')) }} -
-
- - {{ Form::text('points', $product->points, array('placeholder'=>__('Points pro Produkt'), 'class'=>'form-control', 'id'=>'points')) }} -
-
- - {{ Form::text('amount', $product->amount, array('placeholder'=>__('Anzahl/Verfügbarkeit'), 'class'=>'form-control', 'id'=>'amount')) }} -
-
-
-
- - -
-
-
-
- -
-
- Landesspezifische Preise -
- -
- @foreach($country_for_prices as $country) - - {{ Form::hidden('country_prices[]', $country->id) }} -
-
{{$country->de}}
-
-
- @if($country->own_eur) -
-
- -

-
-
- - {{ Form::text('c_price['.$country->id.']', formatNumber($product->getCPrice($country)), array('placeholder'=>__('Preis VK in EUR Brutto'), 'class'=>'form-control', 'id'=>'c_price_'.$country->id)) }} - -
-
- - {{ Form::text('c_tax['.$country->id.']', formatNumber($product->getCTax($country)), array('placeholder'=>__('MwSt in %'), 'class'=>'form-control', 'id'=>'c_tax'.$country->id)) }} - -
-
- - {{ Form::text('c_price_old['.$country->id.']', formatNumber($product->getCPriceOld($country)), array('placeholder'=>__('Streichpreis'), 'class'=>'form-control', 'id'=>'c_price_old'.$country->id)) }} - -
-
- @endif - @if($country->currency) -
-
- -

@if($country->currency_calc) Preis Berechnung automatisch @else Preis manuell - angegeben @endif

-
- - - - {{-- NUR Anzeige vom automatisch berechneten Preis currency_faktor - Auf Basis vom price - Wenn own_eur auf basis vom own_eur price - --}} -
- - {{ Form::text('c_currency['.$country->id.']', formatNumber($product->getRealPrice($country) * $country->currency_faktor), array('class'=>'form-control', 'readonly')) }} - -
- {{--@if($country->currency_calc) - @else - - Eingabe - Währungs Namen aus currency_name - currency_faktor als Hinweis ausgeben - Auf Basis vom price - Wenn own_eur auf basis vom own_eur price -
- - {{ Form::text('c_currency['.$country->id.']', formatNumber($product->getCCurrency($country->id)), array('placeholder'=>__('Preis VK in ').$country->currency_unit, 'class'=>'form-control')) }} -
- @endif --}} - -
- - {{ Form::text('currency_faktor['.$country->id.']', formatNumber($country->currency_faktor, 4), array('class'=>'form-control', 'readonly')) }} -
-
- - {{ Form::text('preis_eur['.$country->id.']', formatNumber($product->getRealPrice($country)), array('class'=>'form-control', 'readonly')) }} -
-
- - {{ Form::text('currency_unit['.$country->id.']', $country->currency_unit, array('class'=>'form-control', 'readonly')) }} -
- -
- @endif -
- @endforeach - für die Einstellung von landesspezifischen Preisen müssen diese unter - Länder -> Land aktiviert werden. -
-
- - -
-
- {{ __('Details') }} -
-
-
- -
- - {{ Form::text('contents', $product->contents, array('placeholder'=>__('Bsp: 150 ml'), 'class'=>'form-control', 'id'=>'contents')) }} -
-
- - {{ Form::text('contents_total', $product->contents_total, array('placeholder'=>__('Bsp: 150'), 'class'=>'form-control', 'id'=>'contents_total')) }} -
-
- - {{ Form::select('unit', $product->unitTypes, $product->unit, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'unit') ) }} -
-
- - {{ Form::text('base_price', $product->getBasePriceFormattedFull(), array('placeholder'=>__(''), 'class'=>'form-control', 'id'=>'base_price', 'readonly')) }} -
- {{--
- - -
- --}} -
- -
- - {{ Form::textarea('description', $product->description , array('placeholder'=>__('description'), 'class'=>'form-control summernote', 'id'=>'description')) }} -
-
- - {{ Form::textarea('usage', $product->usage , array('placeholder'=>__('usage'), 'class'=>'form-control summernote', 'id'=>'usage')) }} -
-
- - {{ Form::textarea('ingredients', $product->ingredients , array('placeholder'=>__('ingredients'), 'class'=>'form-control summernote', 'id'=>'ingredients')) }} -
- -
- - {{ Form::text('icons', $product->icons, array('placeholder'=>__('icons'), 'class'=>'form-control', 'id'=>'icons')) }} - "product_icons_1.png" -
-
-
- -
-
- {{ __('Inhalte') }} -
-
-
- - - - - - - - - - - @foreach($product->p_ingredients as $ingredient) - - - - - - - @endforeach - -
{{__('Name')}}{{__('INCI')}}{{__('Wirkung') }}
{{ $ingredient->name }}{{ $ingredient->inci }}{{ $ingredient->effect }}
-
-
-
- - - Inhaltsstoffe anlegen -
-
-   -
-
-
-
- -@if(Auth::user()->isSuperAdmin()) -
-
- {{ __('SuperAdmin Einstellungen') }} -
-
-
-
- - {{ Form::select('action[]', $product->actionNames, $product->action, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'action', 'multiple') ) }} -
-
- - {{ Form::select('identifier', $product->identifiers_types, $product->identifier, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'identifier') ) }} -
-
- - {{ Form::text('upgrade_to_id', $product->upgrade_to_id, array('placeholder'=>__('Upgrade-ID'), 'class'=>'form-control', 'id'=>'upgrade_to_id')) }} -
-
- @if($product->action && is_array($product->action)) - @foreach ($product->action as $do ) - @if($product->getActionName($do) === 'payment_for_shop_upgrade') - -
{{ $product->getUpgradeToIdName('payment_for_shop_upgrade') }} -
- @endif - @if($product->getActionName($do) === 'payment_for_lead_upgrade') - -
{{ $product->getUpgradeToIdName('payment_for_lead_upgrade') }} - - @endif - @endforeach - @endif -
-
-
-
- - {{ Form::text('wp_number', $product->wp_number, array('placeholder'=>__('WP Number'), 'class'=>'form-control', 'id'=>'wp_number')) }} -
-
-
-
-@endif \ No newline at end of file diff --git a/resources/views/components/abo/product-table-styles.blade.php b/resources/views/components/abo/product-table-styles.blade.php deleted file mode 100644 index 934ef8c7..00000000 --- a/resources/views/components/abo/product-table-styles.blade.php +++ /dev/null @@ -1,124 +0,0 @@ - \ No newline at end of file diff --git a/resources/views/components/abo/product-table.blade.php b/resources/views/components/abo/product-table.blade.php deleted file mode 100644 index 63dfe6dc..00000000 --- a/resources/views/components/abo/product-table.blade.php +++ /dev/null @@ -1,117 +0,0 @@ -@props([ - 'products' => [], - 'productType' => 'base', // 'base' oder 'upgrade' - 'formRoute' => '', - 'formStep' => 3 -]) - -{!! Form::open(['action' => route($formRoute, $formStep), 'method' => 'POST', 'class' => '']) !!} - -@include('components.abo.product-table-styles') - -
-
-
-
{{ __('payment.ordering_country') }}
- {{ App\Services\UserService::getOrderInfo('billing_state') }} -
-
-
{{ __('payment.country_of_delivery') }}
- {{ App\Services\UserService::getOrderInfo('shipping_state') }} -
-
-
{{ __('payment.VAT') }}
- {{ App\Services\UserService::getOrderInfo('tax_free') }} -
-
-
{{ __('payment.reverse_charge_procedure') }}
- {{ App\Services\UserService::getOrderInfo('user_reverse_charge') }} -
-
- - @if($productType === 'base') -
- {!! __('abo.abo_type_info', ['base'=>get_abo_type_badge('base'), 'upgrade'=>get_abo_type_badge('upgrade')]) !!} -
- - @if(isset($error)) -
- {{ $error }} -
- @endif - @endif - - @if(count($products) > 0) -
- - - - - - - - - - @foreach($products as $product) - - - - - - @endforeach - -
{{ __('abo.' . $productType . '_product') }} {{ __('order.unit_price') }}
-
-
- - - - - - - -
-
- 		-
- @if(count($product->images)) - {{ $product->getLang('name') }} - @endif -
-
- {{$product->getLang('name')}} -
{!! get_abo_type_badge($productType) !!} -
- {!! $product->getLang('copy') !!} -
-
- 		- - {{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} € - - @if(\App\Services\UserService::$user_country && \App\Services\UserService::$user_country->currency) - - {!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!} - - @endif -
-
- @endif -
- -
- -
- -{!! Form::close() !!} \ No newline at end of file diff --git a/resources/views/dashboard/reminder.blade.php b/resources/views/dashboard/reminder.blade.php deleted file mode 100755 index a24bc05b..00000000 --- a/resources/views/dashboard/reminder.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -@if($user->active == 1) -@if($user->payment_account && $user->daysActiveAccount() <= config('mivita.remind_first_days')) -
- -
-
- {{__('membership.home_hl') }} -
-
- @if($user->daysActiveAccount() <= 0) - @if($user->isActiveAccount()) -
{{__('membership.home_copy_alert_35')}}
-

{{__('membership.home_copy_last_35', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}

- @else - {{-- 35, 36 --}} - @if($user->daysActiveAccount() == 0) -
{{__('membership.home_copy_alert_36_today', ['datetime'=>$user->getPaymentAccountDateFormat()])}}
- @else -
{{__('membership.home_copy_alert_36', ['days'=>$user->daysActiveAccount()*-1, 'datetime'=>$user->getPaymentAccountDateFormat()])}}
- @endif - @if($user->payment_account && $user->isAboOption()) - {{ __('membership.home_copy_SEPA_36', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }} -
- @endif - -

{{__('membership.home_copy_last_36', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}

- @endif - @elseif($user->daysActiveAccount() < config('mivita.remind_last_days') ) - {{-- 33 --}} -
{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}
-

{{__('membership.home_copy_last_34', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}

- @elseif($user->daysActiveAccount() < config('mivita.remind_sec_days')) - {{-- 33 --}} -
{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}
- @if($user->payment_account && $user->isAboOption()) - @if($user->daysActiveAccount() < config('mivita.abo_booking_days') ) -

{{ __('membership.home_copy_SEPA_33', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}

- @else -

{{ __('membership.home_copy_SEPA_32', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}

- @endif -
- @endif -

{{__('membership.home_copy_last_33', ['days'=>$user->daysActiveAccount()])}}

- @else - {{-- 32 / 31 --}} -
{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}
- @if($user->payment_account && $user->isAboOption()) - {{ __('membership.home_copy_SEPA_32', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }} -
- @endif -

{{__('membership.home_copy_last_31', ['days'=>$user->daysActiveAccount()])}}

- - @endif -
-
- Mitgliedschaft jetzt hier verwalten -
-
- -
-@endif -@endif \ No newline at end of file diff --git a/resources/views/emails/customer_otp.blade.php b/resources/views/emails/customer_otp.blade.php deleted file mode 100644 index 3144715f..00000000 --- a/resources/views/emails/customer_otp.blade.php +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - mivita.care - - - - - -
- @if(isset($copy1line)) - {{ strip_tags($copy1line) }} - @endif - @if(isset($content)) - {{ strip_tags($content) }} - @endif -
- - - - - -
-
-
- - - - -
- - - - -
-
- - - - - - - - - -
- - mivita.care - - -

-
-
- - - - - - @if(isset($copy1line)) - - - - @endif - @if(isset($content)) - - - - @endif - - - - - - -
-

- {{ $salutation }} -
-
- - - - -
-
- {!! nl2br($copy1line) !!} -
-
-
-
-
- - - - -
- {!! nl2br($content) !!} -
-
-
- - - - - - -
- - - - - - -
-

- {{ $button }} -

-
-
-
-
- - - - - - - -
-
- {{ $copy2line }}
- {{ $url }} -

- {{ $copy3line }} -

- {{ $greetings }}
{{ $sender }} -
-

-
- -
- - - - - - - - - -
-

- {{__('email.footer_copy1')}} -

-
- www.mivita.care -
-
-

{{__('email.footer_copy2')}}

- {{ __('dataprotect.data_protect') }}
-

{{__('email.footer_copy3')}}

-
-
-
-
-
-
- - diff --git a/resources/views/errors/_403.blade.php b/resources/views/errors/_403.blade.php deleted file mode 100644 index 8fbd4411..00000000 --- a/resources/views/errors/_403.blade.php +++ /dev/null @@ -1,71 +0,0 @@ - - - - - 404 Not Found - Appwork - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- -
-

Whoops...

-
We couldn't find the page
you are looking for :(
- -
-
- -
-
-
404
-
Not Found
-
-
- -
-
-
- - - - - - diff --git a/resources/views/portal/abo/no_shopping_user.blade.php b/resources/views/portal/abo/no_shopping_user.blade.php deleted file mode 100644 index b739df5d..00000000 --- a/resources/views/portal/abo/no_shopping_user.blade.php +++ /dev/null @@ -1,114 +0,0 @@ -@extends('portal.layouts.layout-2') - -@section('content') - -@if ($errors->any()) -
-
-
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-
-
-@endif - -

-{{__('abo.create_abo')}} -

- -
- - -
- -
- @include('portal.abo._create_info') -
- -
- -
- -
- -
- -
- -
-
- -
-
-
- -@endsection - -@section('scripts') - - - -@endsection \ No newline at end of file diff --git a/resources/views/portal/customer/_edit.blade.php b/resources/views/portal/customer/_edit.blade.php deleted file mode 100644 index e36ca6c1..00000000 --- a/resources/views/portal/customer/_edit.blade.php +++ /dev/null @@ -1,437 +0,0 @@ -
-
-
-
- {{ __('customer.customer_billing_address') }} -
-
- * {{trans('register.required_fields')}} - {{ __('Delivery address') }} -
-
-
-
-
-
-
-
- - {{ Form::text('billing_company', $shopping_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'billing_company', 'tabindex' => 1)) }} -
-
-
-
- - - @if ($errors->has('billing_salutation')) - - {{ $errors->first('billing_salutation') }} - - @endif -
-
-
-
- - {{ Form::text('billing_firstname', $shopping_user->billing_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'id'=>'billing_firstname', 'required'=>true, 'tabindex' => 4)) }} - @if ($errors->has('billing_firstname')) - - {{ $errors->first('billing_firstname') }} - - @endif - -
-
- - {{ Form::text('billing_lastname', $shopping_user->billing_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'id'=>'billing_lastname', 'required'=>true, 'tabindex' => 5)) }} - @if ($errors->has('billing_lastname')) - - {{ $errors->first('billing_lastname') }} - - @endif - -
-
-
-
- - {{ Form::text('billing_address', $shopping_user->billing_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_address', 'tabindex' => 6)) }} - @if ($errors->has('billing_address')) - - {{ $errors->first('billing_address') }} - - @endif -
-
-
-
- - {{ Form::text('billing_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }} -
-
-
-
- - {{ Form::text('billing_zipcode', $shopping_user->billing_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_zipcode', 'tabindex' => 7)) }} - @if ($errors->has('billing_zipcode')) - - {{ $errors->first('billing_zipcode') }} - - @endif -
-
- - {{ Form::text('billing_city', $shopping_user->billing_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_city', 'tabindex' => 8)) }} - @if ($errors->has('billing_city')) - - {{ $errors->first('billing_city') }} - - @endif -
-
-
-
- - - @if ($errors->has('billing_country_id')) - - {{ $errors->first('billing_country_id') }} - - @endif -
-
-
-
- - {{ Form::text('billing_phone', $shopping_user->billing_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'billing_phone', 'tabindex' => 11)) }} -
-
-
-
-
-
-
{{ __('Delivery address') }}
-
-
-
-
- - {{ Form::text('shipping_company', $shopping_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }} -
-
-
-
- - - @if ($errors->has('shipping_salutation')) - - {{ $errors->first('shipping_salutation') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_firstname', $shopping_user->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_firstname', 'tabindex' => 18)) }} - @if ($errors->has('shipping_firstname')) - - {{ $errors->first('shipping_firstname') }} - - @endif -
-
- - {{ Form::text('shipping_lastname', $shopping_user->shipping_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_lastname', 'tabindex' => 19)) }} - @if ($errors->has('shipping_lastname')) - - {{ $errors->first('shipping_lastname') }} - - @endif - -
-
-
-
- - {{ Form::text('shipping_address', $shopping_user->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_address', 'tabindex' => 20)) }} - @if ($errors->has('shipping_address')) - - {{ $errors->first('shipping_address') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }} - @if ($errors->has('shipping_address_2')) - - {{ $errors->first('shipping_address_2') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_zipcode', $shopping_user->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_zipcode', 'tabindex' => 22)) }} - @if ($errors->has('shipping_zipcode')) - - {{ $errors->first('shipping_zipcode') }} - - @endif - -
-
- - {{ Form::text('shipping_city', $shopping_user->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_city', 'tabindex' => 23)) }} - @if ($errors->has('shipping_city')) - - {{ $errors->first('shipping_city') }} - - @endif -
-
-
-
- - - @if ($errors->has('shipping_country_id')) - - {{ $errors->first('shipping_country_id') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_phone', $shopping_user->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone', 'tabindex' => 26)) }} -
-
-
-
- -
-
-
-
- @if($isView === 'customer') - - - - @endif - -
-
- -
- -
-
- -
-
-
-
-
-
- - {{ Form::textarea('remarks', $shopping_user->remarks, array('placeholder'=>__('Comments'), 'class'=>'form-control', 'rows'=>4, 'id'=>'remarks')) }} -
-
-
- - {{ Form::hidden('faker_mail', $shopping_user->faker_mail) }} - {{ Form::hidden('language', $shopping_user->language) }} - - @if($isView === 'customer-add') - {{ Form::hidden('billing_email_1', $billing_email) }} - {{ Form::hidden('billing_email-confirm_1', $billing_email) }} - @if($shopping_user->faker_mail) - {{ Form::hidden('billing_email', $billing_email) }} - {{ Form::hidden('billing_email-confirm', $billing_email) }} - @else -
-
- - {{ Form::text('billing_email', $billing_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'billing_email', 'readonly')) }} -
-
- - {{ Form::text('billing_email-confirm', $billing_email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'billing_email-confirm', 'readonly')) }} -
-
- @endif - @else - @if($shopping_user->faker_mail) - {{ Form::hidden('billing_email', $shopping_user->billing_email) }} - {{ Form::hidden('billing_email-confirm', $shopping_user->billing_email) }} - - @if($isAdmin != 1) - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
- - {{ __('E-Mail Address') }} {{ __('add') }} - -
-
-
-
- - {{ Form::text('new_email_address', '', array('placeholder'=>__('E-Mail Address'), 'class'=>'form-control', 'id'=>'new_email_address', 'required'=>true ,'tabindex' => 1)) }} - @if ($errors->has('new_email_address')) - - {{ $errors->first('new_email_address') }} - - @endif -

{{ __('customer.customer_sovereignty_info1') }}

- -
-
-
- @endif - @else -
-
- - {{ Form::text('billing_email', $shopping_user->billing_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'billing_email')) }} -
-
- - {{ Form::text('billing_email-confirm', $shopping_user->billing_email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'billing_email-confirm')) }} -
-
- @endif - - @endif -
-
- - diff --git a/resources/views/portal/layout/application.blade.php b/resources/views/portal/layout/application.blade.php deleted file mode 100644 index b8a1270f..00000000 --- a/resources/views/portal/layout/application.blade.php +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - {{ config('app.name') }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@yield('styles') - - - - - - - - - - - - - - -@yield('layout-content') - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@yield('scripts') - - - - \ No newline at end of file diff --git a/resources/views/portal/my_orders.blade.php b/resources/views/portal/my_orders.blade.php deleted file mode 100755 index e82a5141..00000000 --- a/resources/views/portal/my_orders.blade.php +++ /dev/null @@ -1,97 +0,0 @@ -@extends('portal.layouts.layout-2') - -@section('content') - - @if ($errors->any()) -
-
-
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-
-
- @endif - -

- {{ __('navigation.my_orders') }} -

-
- -
- - - - - - - - - - - - - - - - - @if($shopping_user->shopping_order) - @forelse($shopping_user->getAllOrdersByMember() as $shopping_order) - - - - - - - - - - - - - @empty - - - - @endforelse - @endif - -
#{{__('tables.date')}}{{__('tables.amount')}}{{__('tables.status')}}{{__('tables.shipping')}}{{__('tables.firstname')}}{{__('tables.lastname')}}{{__('tables.email')}}{{__('tables.invoice')}}{{__('tables.art')}}
- - - - {{ $shopping_order->created_at->format('d.m.Y') }} - - {{ $shopping_order->getFormattedTotalShipping() }} € - - {!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!} - - {{ $shopping_order->getShippedType() }} - - {{ $shopping_order->shopping_user->billing_firstname }}{{ $shopping_order->shopping_user->billing_lastname }}{{ $shopping_order->shopping_user->billing_email }}{{ $shopping_order->isInvoice() ? ' - ' : '-'; - }}{!! \App\Services\Payment::getPaymentForBadge($shopping_order) !!}
{{ __('order.no_orders_found') }}
-
-
- - -@endsection - -@section('scripts') - -@endsection \ No newline at end of file diff --git a/resources/views/portal/order/_detail_shopping_order.blade.php b/resources/views/portal/order/_detail_shopping_order.blade.php index fc14ea80..b018a217 100644 --- a/resources/views/portal/order/_detail_shopping_order.blade.php +++ b/resources/views/portal/order/_detail_shopping_order.blade.php @@ -26,12 +26,11 @@ @endif
- - {{ $shopping_order_item->product->getLang('name') }} +
{{ $shopping_order_item->product->getLang('name') }} @if($shopping_order->is_abo)   {!! get_abo_type_badge_by_product($shopping_order_item->product) !!} @endif - +
{{ __('order.content') }}: {{ $shopping_order_item->product->contents }}
{{ __('order.weight') }}: {{ $shopping_order_item->product->weight }} g
diff --git a/resources/views/public/tracking.blade.php b/resources/views/public/tracking.blade.php new file mode 100644 index 00000000..dfa529e4 --- /dev/null +++ b/resources/views/public/tracking.blade.php @@ -0,0 +1,454 @@ +@extends('web.layouts.layout') + +@section('content') +
+ +
+
+
+

+ + Sendungsverfolgung +

+

+ Verfolgen Sie den Status Ihrer DHL-Sendung in Echtzeit +

+
+
+
+ + +
+
+
+
+
+
+ + + + Geben Sie Ihre DHL Tracking-Nummer ein (10-20 Zeichen) + +
+ + +
+
+
+
+
+ + + + + + + + + + + +
+
+
+
+
+
+
+ + Wo finde ich meine Tracking-Nummer? +
+
    +
  • In der Versandbestätigungs-E-Mail
    • +
  • Auf dem Versandlabel oder Paketschein
    • +
  • In Ihrem Kundenkonto unter "Bestellungen"
    • +
  • Als SMS-Benachrichtigung (falls aktiviert)
    • +
+
+
+ +
+
+
+
+
+
+ + +
+
+
+

+ Probleme bei der Sendungsverfolgung?
+ Kontaktieren Sie uns unter + support@mivita.care + oder besuchen Sie unsere + Kontaktseite. +

+
+
+
+
+ + + +@endsection + +@section('scripts') + + + +@endsection \ No newline at end of file diff --git a/resources/views/sys/admin/cronjobs.blade.php b/resources/views/sys/admin/cronjobs.blade.php deleted file mode 100644 index e53936d7..00000000 --- a/resources/views/sys/admin/cronjobs.blade.php +++ /dev/null @@ -1,50 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - - @if ($errors->any()) -
-
-
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-
-
- @endif - - -

- Cron Jobs -

- - -
- - {{--
- - {!! Form::open(['url' => url()->current(), 'class' => '']) !!} -
- - {{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>20)) }} -
- - - {!! Form::close() !!} -
--}} - - @if(count($values)>0) -
- - @foreach($values as $name=>$link) - {{$name}} | {{$link}}

- @endforeach -
- @endif -
- -@endsection - diff --git a/resources/views/sys/admin/customers.blade.php b/resources/views/sys/admin/customers.blade.php deleted file mode 100644 index 6cacdc3e..00000000 --- a/resources/views/sys/admin/customers.blade.php +++ /dev/null @@ -1,80 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - - @if ($errors->any()) -
-
-
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-
-
- @endif - - -

- Kunden -

- - {!! Form::open(['url' => url()->current(), 'class' => '']) !!} -
- -
- - -
- - {{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>1)) }} -
- - - - - - - -
- - @if(count($values)>0) -
- -
- - - - - - - - - - - - - @foreach($values as $shopping_user) - - - - - - - - - @endforeach - -
ID{{__('Mail')}}{{__('is like')}}{{__('OrderID')}}{{__('txaction')}}{{__('Action')}}
{{$shopping_user->id}}{{$shopping_user->billing_email}}{{$shopping_user->is_like}}@if($shopping_user->shopping_order){{$shopping_user->shopping_order->id}}@endif@if($shopping_user->shopping_order){{$shopping_user->shopping_order->txaction}}@endif
- -
-
- @endif - -
- {!! Form::close() !!} - -@endsection - diff --git a/resources/views/sys/admin/domain-ssl.blade.php b/resources/views/sys/admin/domain-ssl.blade.php deleted file mode 100644 index b9ac5290..00000000 --- a/resources/views/sys/admin/domain-ssl.blade.php +++ /dev/null @@ -1,97 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - - @if ($errors->any()) -
-
-
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-
-
- @endif - - -

- Content Tools: Links -

- - -
- -
- - {!! Form::open(['url' => url()->current(), 'class' => '']) !!} -
- - {{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>20)) }} -
- - - {!! Form::close() !!} -
- - @if(count($values)>0) -
- -
- - - - - - - - - - - - - - @foreach($values as $value) - - - - - - - - - - @endforeach - - -
IDUser-ID{{__('Name')}}{{__('seit')}}DatumErreichbar{{__('Status')}}
{{ $value->id }}{{ $value->user_id }}{{ $value->name }}.mivita.care{{ $value->getActiveDateFormatSmall() }} - @if($value->user && $value->user->payment_shop) - @if($value->user->isActiveShop()) - {{ $value->user->getPaymentShopDateFormat() }} - @else - {{ $value->user->getPaymentShopDateFormat() }} - @endif - @else - - @endif - - - @if($value->getSubdomainAvailable()) - {{ __('available') }} - @if($value->getSubdomainSslSin()) HTTPS @else HTTP @endif - - @else - {{ __('not available') }} HTTP - @endif - {!! get_active_badge($value->active) !!}
- -
- -
- @endif -
- -@endsection - diff --git a/resources/views/sys/admin/import-show.blade.php b/resources/views/sys/admin/import-show.blade.php deleted file mode 100644 index 43f722ce..00000000 --- a/resources/views/sys/admin/import-show.blade.php +++ /dev/null @@ -1,104 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - - -

- Kontakte Import Status -

- -
-
-
-
-
-
-
-
{{ __('eingelesene Datensätze') }}
-
{{ $import['count'] }}
-
-
-
-
- -
-
-
-
-
-
-
-
{{ __('Kontakte importiert') }}
-
{{ count($import['imported']) }}
-
-
-
-
-
-
-
-
-
-
-
-
{{ __('ohne E-Mai Adresse') }}
-
{{ $import['not'] }}
-
-
-
-
- -
-
-
-
-
-
-
-
{{__('Mail schon vorhanden')}}
-
{{ count($import['has_imported']) }}
-
-
-
-
- -
-
- - -
-
- - - - - - - - - - - - - - - - -
{{__('Datei')}}:{{ $file }}
{{__('Import Position start')}}:{{$skip}}
{{__('Import limit')}}:{{ $limit }}
- -
-
Vorhandene Mails
- - @foreach($import['has_imported'] as $row) - - {{$row}}
- - @endforeach - -
-
- - - - -@endsection diff --git a/resources/views/sys/admin/import.blade.php b/resources/views/sys/admin/import.blade.php deleted file mode 100644 index 14d0e9c4..00000000 --- a/resources/views/sys/admin/import.blade.php +++ /dev/null @@ -1,109 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - -

- Kontakte importieren -

- -
-
- Excel-Datei hochladen -
-
- - {!! Form::open([ 'url' => route('sysadmin_import_store'), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'realDropzone' ]) !!} -
- -
- {!! Form::close() !!} - -
- -
-
-@endsection - -@section('scripts') - -@endsection diff --git a/resources/views/sys/admin/shopping-orders.blade.php b/resources/views/sys/admin/shopping-orders.blade.php deleted file mode 100644 index adcffe4e..00000000 --- a/resources/views/sys/admin/shopping-orders.blade.php +++ /dev/null @@ -1,51 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - - @if ($errors->any()) -
-
-
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-
-
- @endif - - -

- Content Tools: Links -

- - -
- -
- - {!! Form::open(['url' => url()->current(), 'class' => '']) !!} -
- - {{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>1)) }} -
- - - - {!! Form::close() !!} -
- - @if(count($values)>0) -
- - @foreach($values as $value) - 
{{$value->billing_email}} | {{$value->orders}}
- @endforeach -
- @endif -
- -@endsection - diff --git a/resources/views/sys/sales/index.blade.php b/resources/views/sys/sales/index.blade.php deleted file mode 100755 index 6b1706a3..00000000 --- a/resources/views/sys/sales/index.blade.php +++ /dev/null @@ -1,65 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') -
-
- Berater Bestellungen -
-
- {!! Form::open(['url' => route('sysadmin_tool_store', ['sales_members']), 'class' => 'form-horizontal', 'id'=>'filter_sales_member']) !!} - - - - {!! Form::close() !!} - -
- -
- - - - - - - - - - - - - - @foreach($values as $value) - - - - - - - - - - - @endforeach - -
{{__('Vorname')}}{{__('Nachname') }}{{__('E-Mail') }}{{__('Betrag') }}{{__('Datum') }}{{__('Order')}}{{__('Status')}}
{{ $value->shopping_user->billing_firstname }}{{ $value->shopping_user->billing_lastname }}{{ $value->shopping_user->billing_email }}{{ $value->getFormattedTotalShipping()." €" }}{{ $value->created_at->format("d.m.Y") }}@foreach($value->shopping_order_items as $shopping_order_item) - {{ $shopping_order_item->product->name }}
- @endforeach - - 		{!! App\Services\Payment::getShoppingOrderBadge($value) !!}
-
- -
- - -@endsection diff --git a/resources/views/user/homeparty/api_order_list.blade.php b/resources/views/user/homeparty/api_order_list.blade.php deleted file mode 100644 index 0f47894e..00000000 --- a/resources/views/user/homeparty/api_order_list.blade.php +++ /dev/null @@ -1,283 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - - -

-
{{ __('navigation.my_homeparty') }} / {{ $homeparty->name }} - {{ $homeparty->date }}
- zurück -

- - @if(Session::has('custom-error')) -
- - {{ Session::get('custom-error') }} -
- @endif - - @if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2) -
Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}
- @endif -
- -
-
-
-
Bestellland
- {{ App\Services\UserService::getOrderInfo('billing_state') }} -
-
-
Lieferland
- {{ App\Services\UserService::getOrderInfo('shipping_state') }} -
-
-
MwSt
- {{ App\Services\UserService::getOrderInfo('tax_free') }} -
-
-
Reverse Charge Verfahren
- {{ App\Services\UserService::getOrderInfo('user_reverse_charge') }} -
-
- Das Lieferland kann nicht mehr geändert werden. - -
-
- - {!! Form::open(['url' => route('user_homeparty_order', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-order-form']) !!} -
-
-
-
-
-
Bestellung anlegen
- @if(!$homeparty->completed) -
- Verwalten - Gäste anlegen -
- @endif -
-
-
-
-
-
-
-
Lieferadresse - @if(!$homeparty->completed) - - @endif -
- @include('user.homeparty._address', ['homeparty_user' => $homeparty->homeparty_host]) -
- - {{-- TODO Berechnung Bonus --}} -
-
Aktuelle Bonusansicht
-
- @include('user.homeparty.show_bonus', ['homeparty' => $homeparty]) -
-
-
-
-
- - @if($homeparty->homeparty_host) -
-
-
-
-
-
Bestellung Gastgeber:in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}
-
-
- @if(!$homeparty->completed) -
- -
- @endif -
-
-
-
- @include('user.homeparty.show_products_order', ['homeparty_guest' => $homeparty->homeparty_host]) -
-
-
- @endif - - @if($homeparty->homeparty_guests) - @php($g_count = 1) - @foreach($homeparty->homeparty_guests as $homeparty_guest) -
-
-
-
-
-
Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}
-
-
- @if(!$homeparty->completed) -
- -
- @endif -
-
-
-
- @include('user.homeparty.show_products_order', ['homeparty_guest' => $homeparty_guest]) -
-
-
- @endforeach - @endif -
- -
-
-
-
-
-
Gesamtübersicht
-
-
-
-
- -
-
- @include('user.homeparty.show_total_order', ['homeparty' => $homeparty]) -
- @if(!$homeparty->completed) -
- @if($homeparty->homeparty_host && $homeparty->homeparty_host->isAddress()) -
- -
-

- Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt. - @else -
- Die Bestellung kann erst abgesendet werden, wenn die Lieferadresse Gastgeber/in angelegt ist. -
- - @endif - @endif -
-
- -
- @if(!$homeparty->completed) - Homparty verwalten - @endif - zurück zur Übersicht -
- {!! Form::close() !!} - - - - -@endsection -@section('scripts') - - -@endsection \ No newline at end of file diff --git a/resources/views/user/homeparty/modal_show_products.blade.php b/resources/views/user/homeparty/modal_show_products.blade.php deleted file mode 100644 index 7062b3b2..00000000 --- a/resources/views/user/homeparty/modal_show_products.blade.php +++ /dev/null @@ -1,71 +0,0 @@ -
-
-
- {{ __('homeparty.add_product') }} / - @if($homeparty_user->is_host) - {{ __('homeparty.host') }} - @else - {{ __('homeparty.guest') }} - @endif - {{ $homeparty_user->billing_firstname }} {{ $homeparty_user->billing_lastname }} -
- -
-
-
- - - - - - - - @if($homeparty->getCardInfo('user_tax_free')) - - - @else - - - @endif - - - -
{{__('tables.image')}}{{__('tables.products')}}{{__('tables.article_no')}}{{ __('tables.ek_price') }} {{__('tables.net')}}{{__('tables.vk_price')}} {{__('tables.net')}}{{ __('tables.ek_price') }} {{__('tables.gross')}}{{__('tables.vk_price')}} {{__('tables.gross')}}{{__('tables.points')}}
-
-
-
- -
-
- \ No newline at end of file diff --git a/resources/views/user/order/_bak_shipping_me.blade.php b/resources/views/user/order/_bak_shipping_me.blade.php deleted file mode 100644 index 7bde655e..00000000 --- a/resources/views/user/order/_bak_shipping_me.blade.php +++ /dev/null @@ -1,215 +0,0 @@ - -@if($user->account) - @if($user->account->same_as_billing) - - -
-
-
- - {{ Form::text('shipping_company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control')) }} -
-
-
-
- - - @if ($errors->has('shipping_salutation')) - - {{ $errors->first('shipping_salutation') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_firstname', $user->account->first_name, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_firstname')) - - {{ $errors->first('shipping_firstname') }} - - @endif - -
-
- - {{ Form::text('shipping_lastname', $user->account->last_name, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_lastname')) - - {{ $errors->first('shipping_lastname') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_address', $user->account->address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_address')) - - {{ $errors->first('shipping_address') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_address_2', $user->account->address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control')) }} -
-
-
-
- - {{ Form::text('shipping_zipcode', $user->account->zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_zipcode')) - - {{ $errors->first('shipping_zipcode') }} - - @endif -
-
- - {{ Form::text('shipping_city', $user->account->city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_city')) - - {{ $errors->first('shipping_city') }} - - @endif -
-
-
-
- - - @if ($errors->has('shipping_state')) - - {{ $errors->first('shipping_state') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }} -
-
-
- - @else - -
-
-
- - {{ Form::text('shipping_company', $user->account->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control')) }} -
-
-
-
- - - @if ($errors->has('shipping_salutation')) - - {{ $errors->first('shipping_salutation') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_firstname', $user->account->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_firstname')) - - {{ $errors->first('shipping_firstname') }} - - @endif -
-
- - {{ Form::text('shipping_lastname', $user->account->shipping_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_lastname')) - - {{ $errors->first('shipping_lastname') }} - - @endif - -
-
-
-
- - {{ Form::text('shipping_address', $user->account->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_address')) - - {{ $errors->first('shipping_address') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_address_2', $user->account->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control')) }} - @if ($errors->has('shipping_address_2')) - - {{ $errors->first('shipping_address_2') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_zipcode', $user->account->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_zipcode')) - - {{ $errors->first('shipping_zipcode') }} - - @endif - -
-
- - {{ Form::text('shipping_city', $user->account->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_city')) - - {{ $errors->first('shipping_city') }} - - @endif -
-
-
-
- - - @if ($errors->has('shipping_state')) - - {{ $errors->first('shipping_state') }} - - @endif -
-
- -
-
- - {{ Form::text('shipping_phone', $user->account->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }} -
-
-
- @endif -@else -

Fehler: Keine Adressdaten gefunden!

-@endif \ No newline at end of file diff --git a/resources/views/user/order/_bak_shipping_ot.blade.php b/resources/views/user/order/_bak_shipping_ot.blade.php deleted file mode 100644 index 21951c78..00000000 --- a/resources/views/user/order/_bak_shipping_ot.blade.php +++ /dev/null @@ -1,210 +0,0 @@ - - @if($shopping_user->same_as_billing) - -
-
-
- - {{ Form::text('shipping_company', $shopping_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control')) }} -
-
-
-
- - - @if ($errors->has('shipping_salutation')) - - {{ $errors->first('shipping_salutation') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_firstname', $shopping_user->billing_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_firstname')) - - {{ $errors->first('shipping_firstname') }} - - @endif - -
-
- - {{ Form::text('shipping_lastname', $shopping_user->billing_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_lastname')) - - {{ $errors->first('shipping_lastname') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_address', $shopping_user->billing_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_address')) - - {{ $errors->first('shipping_address') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control')) }} -
-
-
-
- - {{ Form::text('shipping_zipcode', $shopping_user->billing_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_zipcode')) - - {{ $errors->first('shipping_zipcode') }} - - @endif -
-
- - {{ Form::text('shipping_city', $shopping_user->billing_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_city')) - - {{ $errors->first('shipping_city') }} - - @endif -
-
-
-
- - - @if ($errors->has('shipping_state')) - - {{ $errors->first('shipping_state') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_phone', $shopping_user->billing_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }} -
-
-
- - @else - -
-
-
- - {{ Form::text('shipping_company', $shopping_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control')) }} -
-
-
-
- - - @if ($errors->has('shipping_salutation')) - - {{ $errors->first('shipping_salutation') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_firstname', $shopping_user->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_firstname')) - - {{ $errors->first('shipping_firstname') }} - - @endif -
-
- - {{ Form::text('shipping_lastname', $shopping_user->shipping_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_lastname')) - - {{ $errors->first('shipping_lastname') }} - - @endif - -
-
-
-
- - {{ Form::text('shipping_address', $shopping_user->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_address')) - - {{ $errors->first('shipping_address') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control')) }} - @if ($errors->has('shipping_address_2')) - - {{ $errors->first('shipping_address_2') }} - - @endif -
-
-
-
- - {{ Form::text('shipping_zipcode', $shopping_user->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_zipcode')) - - {{ $errors->first('shipping_zipcode') }} - - @endif - -
-
- - {{ Form::text('shipping_city', $shopping_user->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true)) }} - @if ($errors->has('shipping_city')) - - {{ $errors->first('shipping_city') }} - - @endif -
-
-
-
- - - @if ($errors->has('shipping_state')) - - {{ $errors->first('shipping_state') }} - - @endif -
-
- -
-
- - {{ Form::text('shipping_phone', $shopping_user->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }} -
-
-
- @endif \ No newline at end of file diff --git a/resources/views/user/order/api_order_list.blade.php b/resources/views/user/order/api_order_list.blade.php deleted file mode 100644 index 0f47894e..00000000 --- a/resources/views/user/order/api_order_list.blade.php +++ /dev/null @@ -1,283 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - - -

-
{{ __('navigation.my_homeparty') }} / {{ $homeparty->name }} - {{ $homeparty->date }}
- zurück -

- - @if(Session::has('custom-error')) -
- - {{ Session::get('custom-error') }} -
- @endif - - @if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2) -
Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}
- @endif -
- -
-
-
-
Bestellland
- {{ App\Services\UserService::getOrderInfo('billing_state') }} -
-
-
Lieferland
- {{ App\Services\UserService::getOrderInfo('shipping_state') }} -
-
-
MwSt
- {{ App\Services\UserService::getOrderInfo('tax_free') }} -
-
-
Reverse Charge Verfahren
- {{ App\Services\UserService::getOrderInfo('user_reverse_charge') }} -
-
- Das Lieferland kann nicht mehr geändert werden. - -
-
- - {!! Form::open(['url' => route('user_homeparty_order', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-order-form']) !!} -
-
-
-
-
-
Bestellung anlegen
- @if(!$homeparty->completed) -
- Verwalten - Gäste anlegen -
- @endif -
-
-
-
-
-
-
-
Lieferadresse - @if(!$homeparty->completed) - - @endif -
- @include('user.homeparty._address', ['homeparty_user' => $homeparty->homeparty_host]) -
- - {{-- TODO Berechnung Bonus --}} -
-
Aktuelle Bonusansicht
-
- @include('user.homeparty.show_bonus', ['homeparty' => $homeparty]) -
-
-
-
-
- - @if($homeparty->homeparty_host) -
-
-
-
-
-
Bestellung Gastgeber:in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}
-
-
- @if(!$homeparty->completed) -
- -
- @endif -
-
-
-
- @include('user.homeparty.show_products_order', ['homeparty_guest' => $homeparty->homeparty_host]) -
-
-
- @endif - - @if($homeparty->homeparty_guests) - @php($g_count = 1) - @foreach($homeparty->homeparty_guests as $homeparty_guest) -
-
-
-
-
-
Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}
-
-
- @if(!$homeparty->completed) -
- -
- @endif -
-
-
-
- @include('user.homeparty.show_products_order', ['homeparty_guest' => $homeparty_guest]) -
-
-
- @endforeach - @endif -
- -
-
-
-
-
-
Gesamtübersicht
-
-
-
-
- -
-
- @include('user.homeparty.show_total_order', ['homeparty' => $homeparty]) -
- @if(!$homeparty->completed) -
- @if($homeparty->homeparty_host && $homeparty->homeparty_host->isAddress()) -
- -
-

- Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt. - @else -
- Die Bestellung kann erst abgesendet werden, wenn die Lieferadresse Gastgeber/in angelegt ist. -
- - @endif - @endif -
-
- -
- @if(!$homeparty->completed) - Homparty verwalten - @endif - zurück zur Übersicht -
- {!! Form::close() !!} - - - - -@endsection -@section('scripts') - - -@endsection \ No newline at end of file diff --git a/resources/views/user/order/custom_payment.blade.php b/resources/views/user/order/custom_payment.blade.php deleted file mode 100644 index 6817b4e6..00000000 --- a/resources/views/user/order/custom_payment.blade.php +++ /dev/null @@ -1,278 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') -
-
- @if($is_abo) -

{{ __('order.order_abo_was_placed_successfully') }}

- @else -

{{ __('order.order_was_placed_successfully') }}

- @endif - -
- {{ __('order.payment_link_for_your_customer') }} -
-
- - {{ route('checkout.checkout_card', ['identifier'=>$identifier]) }} - -
-
-
-
-
- {{ __('customer.customer_billing_address') }} -
-
- @if($shopping_user->billing_company) -
-
{{ __('Company') }}
- {{ $shopping_user->billing_company }} -
- @endif -
-
{{ __('Salutation') }}
- {{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }} -
-
-
{{ __('First name') }}
- {{ $shopping_user->billing_firstname }} -
-
-
{{ __('Last name') }}
- {{ $shopping_user->billing_lastname }} -
-
-
-
-
{{ __('Street') }}
- {{ $shopping_user->billing_address }} -
-
-
{{ __('Addition') }}
- {{ $shopping_user->billing_address_2 }} -
-
-
{{ __('Postcode') }}
- {{ $shopping_user->billing_zipcode }} -
-
-
{{ __('City') }}
- {{ $shopping_user->billing_city }} -
-
-
{{ __('Country') }}
- {{ $shopping_user->billing_country->getLocated() }} -
-
-
{{ __('Phone') }}
- {{ $shopping_user->billing_phone }} -
-
-
{{ __('E-Mail') }}
- @if($shopping_user->faker_mail) "-" @else {{ $shopping_user->billing_email }} @endif -
-
-
-
- - - -
-
- {{ __('Delivery address') }} -
- @if($shopping_user->same_as_billing) - {{__('email.checkout_mail_same_address')}} - @else -
- @if($shopping_user->shipping_company) -
-
{{ __('Company') }}
- {{ $shopping_user->shipping_company }} -
- @endif -
-
{{ __('Salutation') }}
- {{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->shipping_salutation) }} -
-
-
{{ __('First name') }}
- {{ $shopping_user->shipping_firstname }} -
-
-
{{ __('Last name') }}
- {{ $shopping_user->shipping_lastname }} -
-
-
-
-
{{ __('Street') }}
- {{ $shopping_user->shipping_address }} -
-
-
{{ __('Addition') }}
- {{ $shopping_user->shipping_address_2 }} -
-
-
{{ __('Postcode') }}
- {{ $shopping_user->shipping_zipcode }} -
-
-
{{ __('City') }}
- {{ $shopping_user->shipping_city }} -
-
-
{{ __('Country') }}
- {{ $shopping_user->shipping_country->getLocated() }} -
-
-
{{ __('Phone') }}
- {{ $shopping_user->shipping_phone }} -
-
- @endif -
- -
-
- {{ __('tables.order') }} -
- @if(isset($yard_shopping_items)) - -
- - - - - - - - - @foreach($yard_shopping_items['items'] as $item) - - - - - - - - @endforeach - - - - - - - - - - - - - - - - - - - - - - - - - - - @if($yard_shopping_items['tax_free']) - - - - - @else - - - - - @endif - -
{{ __('tables.product') }} @if($yard_shopping_items['tax_free']) - {{ __('tables.net_price') }} - @else - {{ __('tables.price') }} - @endif - {{ __('tables.quantity') }}{{ __('tables.sum') }}
-
- @if($item->image) - - @endif - -
-
{{ $item->name }} - {!! get_abo_type_badge($item->abo_type) !!}
-
-
{{ __('order.content') }}: {{ $item->contents }}
-
{{ __('order.art_no') }}: {{ $item->number }}
-
-
-
- 		- @if($yard_shopping_items['tax_free']) - {{ formatNumber($item->price_net, 2) }} € - @else - {{ formatNumber($item->price, 2) }} € - @endif - - {{ $item->qty }} - - @if($yard_shopping_items['tax_free']) - {{ formatNumber($item->price_net_total, 2) }} € - @else - {{ formatNumber($item->price_total, 2) }} € - @endif -
- {{__('order.subtotal')}} - - {{ $yard_shopping_items['total']['subtotal'] }} € -
- {{__('Delivery country')}} - - {{ $yard_shopping_items['total']['shippingCountryName'] }} -
- {{__('order.shipping_costs')}} - - {{ $yard_shopping_items['total']['shippingNet'] }} € -
- {{__('order.total_without_VAT')}} - - {{ $yard_shopping_items['total']['subtotalWithShipping'] }} € -
- {{__('order.plus_VAT')}} - - {{ $yard_shopping_items['total']['taxWithShipping'] }} € -
- {{__('order.total_net')}} - - {{ $yard_shopping_items['total']['totalWithShipping'] }} € -
- {{__('order.total_net')}} - - {{ $yard_shopping_items['total']['totalWithShipping'] }} € -
- {{__('email.checkout_mail_subtotal_ws')}} -
- {{__('order.total_gross')}} - - {{ $yard_shopping_items['total']['totalWithShipping'] }} € -
- {{__('email.checkout_mail_tax_info')}} -
-
- @endif - -
-
- - -@endsection - diff --git a/resources/views/user/order/list_form.blade.php b/resources/views/user/order/list_form.blade.php deleted file mode 100644 index 8762264e..00000000 --- a/resources/views/user/order/list_form.blade.php +++ /dev/null @@ -1,103 +0,0 @@ - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ProduktPreisAnzahlSumme
-
- -
- Nike Men Black Liteforce III Sneakers - - Color: -   - Size: EU 37   - Ships from: China - -
-
- 		- $57.55 - - - - 115.1 € - - × -
-
- -
- WALKING 400 BLUE CAT3 - - Ships from: Germany - -
-
- 		- $20.55 - - - - $20.55 - - × -
-
- - -
-
- {{-- - - --}} -
-
-
- -
$20
-
-
- -
$1164.65
-
-
-
-
-
- -
- diff --git a/resources/views/user/shop/sales/api_order_detail.blade.php b/resources/views/user/shop/sales/api_order_detail.blade.php deleted file mode 100644 index f57b9e2a..00000000 --- a/resources/views/user/shop/sales/api_order_detail.blade.php +++ /dev/null @@ -1,23 +0,0 @@ -
-
-
- {{ __('Bestellung Kunde') }} #{{$shopping_order->id}} -
- -
-
- @include('admin.sales._detail') - - -
-
- -
- - - -
\ No newline at end of file diff --git a/resources/views/user/team/_points_detail.blade.php b/resources/views/user/team/_points_detail.blade.php deleted file mode 100644 index 3173fad5..00000000 --- a/resources/views/user/team/_points_detail.blade.php +++ /dev/null @@ -1,110 +0,0 @@ -@extends('layouts.layout-2') - -@section('content') - - @if ($errors->any()) -
-
-
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
-
-
- @endif -

- {{ __('navigation.my_team') }} -

-
-
- {{__('Points')}} -
-
- {!! Form::open(['url' => route('user_team_points'), 'class' => 'form-horizontal', 'id'=>'form_filter_user_points']) !!} - -
-
- -
-
- -
-
- {!! Form::close() !!} -
- - - -
-
- - - - - - - - - - - - -
{{__('Datum') }}{{__('Points')}}{{__('Umsatz netto')}}{{__('Art')}}{{__('Bestellung')}}{{__('Info') }}
-
-
-
- -@endsection diff --git a/resources/views/web/templates/_card.blade.php b/resources/views/web/templates/_card.blade.php deleted file mode 100644 index f3b61b32..00000000 --- a/resources/views/web/templates/_card.blade.php +++ /dev/null @@ -1,383 +0,0 @@ -@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') - -@section('content') - -
-
- -
-
-
- - - - -
-
- -

Warenkorb

- - - - - -
- - -
- -

Du hast {{ Yard::instance('shopping')->count() }} Artikel in Deinem Warenkorb

- @if(Yard::instance('shopping')->getShippingFree()) -
Versandkostenfrei ab {{ formatNumber(Yard::instance('shopping')->getShippingFree()) }} €**
- @endif - - - @if(Yard::instance('shopping')->content()->count()) - - {!! Form::open(['url' => url(Util::getPostRoute().'card/update'), 'class' => 'cartContent clearfix', 'id'=>'']) !!} - - -
- -
-
- -
- -
- -
-
-
- Artikel -
-
- Einzelpreis -
-
- Anzahl -
-
-
- -
-
- - @foreach(Yard::instance('shopping')->content() as $row) - @php($product = \App\Models\Product::find($row->id)) - -
- -
- - @if($row->options->has('image')) - - @else - - @endif - -
- -
-
-
- {{ $row->name }} -
Inhalt: {{ $product->contents }}
-
Art.-Nr.: {{ $product->number }}
-
Lieferzeit: 1-3 Werktage
- -
- Artikel entfernen -
-
- -
-
{{ $row->price() }} €
- @if(Yard::instance('shopping')->isPriceCurrency()) - ~{{ Yard::instance('shopping')->getCurrencyByKey('price', $row, 2) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} - @endif -
{{ $product->getBasePriceFormattedFullWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }}
-
- @if(Yard::instance('shopping')->getUserTaxFree()) - * Preis netto - @else - * inkl. {{ number_format($row->taxRate, 0)}}% MwSt.% MwSt. - @endif -
-
- -
-
- -
-
- {{ $row->subtotal() }} € - @if(Yard::instance('shopping')->isPriceCurrency()) -
- ~{{ Yard::instance('shopping')->getCurrencyByKey('subtotal', $row, 2) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} - @endif -
- -
-
-
- -
- - @endforeach - Warenkorb löschen - -
-
- {!! Form::close() !!} - - @endif - -
- - -
- - @if(Yard::instance('shopping')->content()->count()) -

Warenkorb Summe

- - -
-
-
- -
- {{ Yard::instance('shopping')->total() }} € - Zwischensumme: -
-
- -
- {{ Yard::instance('shopping')->getShippingCountryName() }} - Lieferland: -
- - {{--
- -
Lieferland:
-
-
- -
-
-
--}} -
- {{ Yard::instance('shopping')->shipping() }} € - Versandkosten: -
-
- @if(Yard::instance('shopping')->getUserTaxFree()) -
- {{ Yard::instance('shopping')->subtotalWithShipping() }} € - Summe netto: -
- @else -
- {{ Yard::instance('shopping')->subtotalWithShipping() }} € - Summe ohne MwSt: -
-
- {{ Yard::instance('shopping')->taxWithShipping() }} € - zzgl. {{-- Yard::getTaxRate() --}} MwSt: -
- @endif -
- - {{ Yard::instance('shopping')->totalWithShipping() }} € - Gesamtsumme: - - zur Kasse -
-

Sie werden auf unseren checkout Server weitergeletet, die Verbindung ist mit SSL verschlüsselt.

-
-
-
- @endif - -
-
-

-
-

Alle Preise inkl. gesetzl. Mehrwertsteuer zzgl. Versandkosten, wenn nicht anders beschrieben

- -
-
- -@endsection \ No newline at end of file diff --git a/resources/views/web/templates/agb.blade.php b/resources/views/web/templates/agb.blade.php deleted file mode 100644 index 481a9d96..00000000 --- a/resources/views/web/templates/agb.blade.php +++ /dev/null @@ -1,83 +0,0 @@ -@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') - -@section('content') -
-
- -
-

Allgemeinen Geschäftsbedingungen

-
-
- Grundlegendes
- 1) Die nachstehenden Geschäftsbedingungen gelten für alle Verträge, die Sie mit uns als Anbieter (mivita e.K.) über die Internetseite www.mivita.care schließen. Das Warenangebot in unserem Online-Shop richtet sich ausschließlich an volljährige Kunden. Der Einbeziehung von Allgemeinen Geschäftsbedingungen von Kunden, die diesen Geschäftsbedingungen widersprechen, wird bereits jetzt widersprochen. Die Vertragssprache ist deutsch. Sie können diese Geschäfts-bedingungen auf unserer Website abrufen und ausdrucken. -
-
- 2) Den vollständigen Vertragstext speichern wir nicht. Die Vertragsdaten können Sie vor Absendung Ihrer Bestellung über das Online - Warenkorbsystem ausdrucken oder elektronisch sichern. Nach Zugang Ihrer Bestellung schicken wir Ihnen die Bestelldaten, die gesetzlich vorgeschriebenen Informationen bei Fernabsatzverträgen und die Allgemeinen Geschäftsbedingungen nochmals per Mail zu. -

- Grundlegendes
- 1) Unsere Warenangebote im Internet sind unverbindlich und stellen kein verbindliches Angebot zum Abschluss eines Vertrages dar. Sie können über unser Online - Warenkorbsystem eine Bestellung, also ein verbindliches Kaufangebot abgeben. Hierzu legen Sie die zum Kauf beabsichtigten Waren im „Warenkorb” ab. Über die entsprechende Schaltfläche in der Navigationsleiste können Sie den „Warenkorb” aufrufen und dort jederzeit Änderungen vornehmen. Nach Aufrufen der Seite „Kasse” und der Eingabe Ihrer persönlichen Daten sowie der Zahlungs- und Versandbedingungen werden abschließend nochmals alle Bestelldaten in einer Bestellübersicht angezeigt. Sie haben hier die Möglichkeit, vor der Absendung Ihrer Bestellung sämtliche Angaben nochmals zu überprüfen, zu ändern (auch über die Funktion „zurück” des Internetbrowsers) bzw. den Kauf abzubrechen. Durch Absendung der Bestellung über die Schaltfläche “Kaufen” geben Sie ein verbindliches Angebot zum Abschluss des Vertrages ab. Sie erhalten dann eine automatische Eingangsbestätigung per Mail, die noch nicht zum Vertragsschluss führt. -

- (2) Wir können Ihr Angebot innerhalb von 2 Tagen durch Übermittlung einer Bestellbestätigung per Mail annehmen. Sofern Sie innerhalb dieser Frist keine entsprechende Nachricht erhalten sollten, sind Sie nicht mehr an Ihre Bestellung gebunden. Gegebenenfalls bereits erbrachte Leistungen erstatten wir Ihnen in diesem Fall unverzüglich zurück. -

- (3) Die Abwicklung der Bestellung und Übermittlung aller im Zusammenhang mit dem Vertragsschluss erforderlichen Informationen erfolgt per Mail zum Teil automatisiert. Sie haben deshalb sicherzustellen, dass die von Ihnen bei uns hinterlegte Mail-Adresse zutreffend ist, der Empfang der Mails technisch sichergestellt und insbesondere nicht durch SPAM-Filter verhindert wird. -

- - § 3 Preise/Zahlungsmodalitäten
- (1) Die in unseren Angeboten genannten Preise sowie die Versandkosten stellen Gesamtpreise dar. Sie beinhalten alle Preisbestandteile einschließlich aller anfallenden Steuern. -

- (2) Die Versandkosten sind nicht im Kaufpreis enthalten. Sie können über eine entsprechend bezeichnete Schaltfläche auf unserer Website oder in der jeweiligen Artikelbeschreibung abgerufen werden. Die Versandkosten werden weiterhin im Laufe des Bestellvorganges gesondert ausgewiesen und sind von Ihnen zusätzlich zu tragen, soweit nicht die versandkostenfreie Lieferung zugesagt ist. -

- (3) Wir bieten Ihnen verschiedene Zahlungsarten an. Diese sind unter einer entsprechend bezeichneten Schaltfläche auf unserer Website oder in der jeweiligen Artikelbeschreibung ausgewiesen. Soweit nicht anders angegeben, sind die Zahlungsansprüche aus dem geschlossenen Vertrag sofort zur Zahlung fällig. -

- § 4 Lieferbedingungen
- (1) Lieferbedingungen, Liefertermin und gegebenenfalls bestehende Lieferbeschränkungen können Sie auf einer entsprechend bezeichneten Schaltfläche auf unserer Website oder in der jeweiligen Artikelbeschreibung abrufen. -

- (2) Bei Verbrauchern geht die Gefahr des zufälligen Untergangs und der zufälligen Verschlechterung der verkauften Sache während der Versendung erst mit der Übergabe der Ware an diese über. Dies unabhängig davon, ob die Versendung versichert oder unversichert erfolgt. Dies gilt allerdings nicht, wenn Sie eigenständig ein nicht vom Unternehmer benanntes Transportunternehmen oder eine sonst zur Ausführung der Versendung bestimmte Person beauftragt haben. -

- (3) Bei Unternehmern erfolgt die Lieferung und Versendung auf eigene Gefahr. -

- § 5 Zurückbehaltungsrecht, Eigentumsvorbehalt
- (1) Ein Zurückbehaltungsrecht können Sie nur ausüben, soweit es sich um Forderungen aus demselben Vertragsverhältnis handelt. -

- (2) Die Ware bleibt bis zur vollständigen Zahlung des Kaufpreises unser Eigentum. -

- (3) Bei Unternehmern gilt ergänzend Folgendes: -

- - Wir behalten uns das Eigentum an der Ware bis zum vollständigen Ausgleich aller Forderungen aus der laufenden Geschäftsbeziehung vor. Vor Übergang des Eigentums an der Vorbehaltsware ist eine Verpfändung oder Sicherheitsübereignung nicht zulässig. -
- - Sie dürfen die Ware im ordentlichen Geschäftsgang weiterverkaufen. Für diesen Fall treten Sie bereits jetzt alle Forderungen in Höhe des Rechnungsbetrages, die Ihnen aus dem Weiterverkauf erwachsen, an uns ab. Wir nehmen die Abtretung an, Sie sind jedoch zur Einziehung der Forderungen ermächtigt. Soweit Sie Ihren Zahlungsverpflichtungen nicht ordnungsgemäß nachkommen, behalten wir uns das Recht vor, Forderungen selbst einzuziehen. -
- - Bei Verbindung und Vermischung der Vorbehaltsware erwerben wir Miteigentum an der neuen Sache im Verhältnis des Rechnungswertes der Vorbehaltsware zu den anderen verarbeiteten Gegenständen zum Zeitpunkt der Verarbeitung. -
- - Wir verpflichteten uns, die uns zustehenden Sicherheiten auf Verlangen insoweit freizugeben, als der realisierbare Wert unserer Sicherheiten die zu sichernden Forderungen um mehr als 10 % übersteigt. Die Auswahl der freizugebenden Sicherheiten obliegt uns. -

- § 6 Gewährleistung
- (1) Es bestehen die gesetzlichen Mängelhaftungsrechte. -

- (2) Bei Unternehmern gilt abweichend von Abs.1: -

- - als Unternehmer haben Sie die Ware unverzüglich und mit der gebotenen Sorgfalt auf Qualitäts- und Mengenabweichungen zu untersuchen und uns offensichtliche Mängel binnen 7 Tagen ab Empfang der Ware schriftlich anzuzeigen. Zur Fristwahrung genügt die rechtzeitige Absendung. Dies gilt auch für später festgestellte verdeckte Mängel ab Entdeckung. Sollten Sie Ihrer Untersuchungs- und Rügepflicht nicht nachkommen, ist die Geltendmachung von Gewährleistungsansprüchen ausgeschlossen. -
- - beim Vorliegen von Mängeln können wir nach unserer Wahl Gewähr durch Nachbesserung oder Ersatzlieferung leisten. Bei einem Fehlschlagen der Mängelbeseitigung können Sie nach Ihrer Wahl Minderung verlangen oder vom Vertrag zurücktreten. Die Mängelbeseitigung gilt nach erfolglosem zweiten Versuch als fehlgeschlagen, wenn sich nicht insbesondere aus der Art der Sache oder des Mangels oder den sonstigen Umständen etwas anderes ergibt. Im Falle der Nachbesserung müssen wir nicht die erhöhten Kosten tragen, die durch die Verbringung der Ware an einen anderen Ort als den Erfüllungsort entstehen, sofern die Verbringung nicht dem bestimmungsgemäßen Gebrauch der Ware entspricht. -
- - die Gewährleistungsfrist beträgt ein Jahr ab Ablieferung der Ware. Die verkürzte Gewährleistungsfrist gilt nicht für uns zurechenbare schuldhaft verursachte Schäden aus der Verletzung des Lebens, des Körpers oder der Gesundheit und grob fahrlässig oder vorsätzlich verursachte Schäden bzw. Arglist, sowie bei Rückgriffsansprüchen gemäß §§ 478, 479 BGB. -
- § 7 Haftung
- (1) Wir haften uneingeschränkt für Schäden aus der Verletzung des Lebens, des Körpers oder der Gesundheit. Weiterhin haften wir ohne Einschränkung in allen Fällen des Vorsatzes und grober Fahrlässigkeit, bei arglistigem Verschweigen eines Mangels, bei Übernahme der Garantie für die Beschaffenheit des Kaufgegenstandes und in allen anderen gesetzlich geregelten Fällen. -
- (2) Sofern wesentliche Vertragspflichten betroffen sind, ist unsere Haftung bei leichter Fahrlässigkeit auf den vertragstypischen, vorhersehbaren Schaden beschränkt. Wesentliche Vertragspflichten sind wesentliche Pflichten, die sich aus der Natur des Vertrages ergeben und deren Verletzung die Erreichung des Vertragszweckes gefährden würde sowie Pflichten, die der Vertrag uns nach seinem Inhalt zur Erreichung des Vertragszwecks auferlegt, deren Erfüllung die ordnungsgemäße Durchführung des Vertrags überhaupt erst möglich machen und auf deren Einhaltung Sie regelmäßig vertrauen dürfen. -
- § 8 Schlussbestimmungen
- (1) Es gilt deutsches Recht. Bei Verbrauchern gilt diese Rechtswahl nur, soweit hierdurch der durch zwingende Bestimmungen des Rechts des Staates des gewöhnlichen Aufenthaltes des Verbrauchers gewährte Schutz nicht entzogen wird (Günstigkeitsprinzip). Die Bestimmungen des UN-Kaufrechts finden ausdrücklich keine Anwendung. -

- (2) Erfüllungsort für alle Leistungen aus den mit uns bestehenden Geschäftsbeziehungen sowie Gerichtsstand ist unser Sitz, soweit Sie nicht Verbraucher, sondern Kaufmann, juristische Person des öffentlichen Rechts oder öffentlich-rechtliches Sondervermögen sind. Dasselbe gilt, wenn Sie keinen allgemeinen Gerichtsstand in Deutschland oder der EU haben oder der Wohnsitz oder gewöhnliche Aufenthalt im Zeitpunkt der Klageerhebung nicht bekannt ist. Die Befugnis, auch das Gericht an einem anderen gesetzlichen Gerichtsstand anzurufen, bleibt hiervon unberührt. -

- - Stand: 05.10.2018 -

-
- -
-
- -@endsection \ No newline at end of file diff --git a/resources/views/web/templates/datenschutz.blade.php b/resources/views/web/templates/datenschutz.blade.php deleted file mode 100644 index 2e03c4f4..00000000 --- a/resources/views/web/templates/datenschutz.blade.php +++ /dev/null @@ -1,231 +0,0 @@ -@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') - -@section('content') -
-
- -
-

Datenschutzerklärung

-
- -
-Unsere Website kann grundsätzlich ohne Angabe personenbezogener Daten genutzt werden. Sofern Sie bestimmte Leistungen über unsere Website in Anspruch nehmen wollen, kann eine Verarbeitung Ihrer personenbezogenen Daten erforderlich werden. -
-Die Verarbeitung Ihrer personenbezogener Daten erfolgt stets in Übereinstimmung mit der Datenschutz-Grundverordnung (DSGVO) und den für uns geltenden landesspezifischen Datenschutzbestimmungen. -
-Wir haben nach Maßgabe des Art. 32 DSGVO geeignete technische und organisatorische Maßnahmen getroffen, um ein angemessenes Schutzniveau zu gewährleisten. Weiterhin haben wir Verfahren eingerichtet, die eine Wahrnehmung Ihrer Rechte, die Löschung von Daten und die Reaktion auf eine Gefährdung der Daten gewährleisten. Den Schutz Ihrer personenbezogenen Daten haben wir bereits bei der Entwicklung und Auswahl der verwendeten Hardware und Software berücksichtigt. Hiermit kommen wir dem Prinzip des Datenschutzes durch Technikgestaltung/durch datenschutzfreundliche Voreinstellungen nach, Art. 25 DSGVO. Zu unseren Sicherheitsmaßnahmen gehören insbesondere die verschlüsselte Übertragung (SSL-Verschlüsselung) von Daten zwischen Ihrem Browser und unserem Server. -

-I. Definitionen -
-Zur besseren Verständlichkeit unserer Datenschutzerklärung möchten wir Ihnen zunächst einige der verwendeten Begriffe erläutern. Im Sinne dieser Datenschutzerklärung bezeichnet der Ausdruck: -

-1) „personenbezogene Daten“ alle Informationen, die sich auf eine identifizierte oder identifizierbare natürliche Person (im Folgenden "betroffene Person") beziehen; als identifizierbar wird eine natürliche Person angesehen, die direkt oder indirekt, insbesondere mittels Zuordnung zu einer Kennung wie einem Namen, zu einer Kennnummer, zu Standortdaten, zu einer Online-Kennung oder zu einem oder mehreren besonderen Merkmalen identifiziert werden kann, die Ausdruck der physischen, physiologischen, genetischen, psychischen, wirtschaftlichen, kulturellen oder sozialen Identität dieser natürlichen Person sind; -

-2) „Verarbeitung“ jeden mit oder ohne Hilfe automatisierter Verfahren ausgeführten Vorgang oder jede solche Vorgangsreihe im Zusammenhang mit personenbezogenen Daten wie das Erheben, das Erfassen, die Organisation, das Ordnen, die Speicherung, die Anpassung oder Veränderung, das Auslesen, das Abfragen, die Verwendung, die Offenlegung durch Übermittlung, Verbreitung oder eine andere Form der Bereitstellung, den Abgleich oder die Verknüpfung, die Einschränkung, das Löschen oder die Vernichtung; -

-3) "Einschränkung der Verarbeitung" die Markierung gespeicherter personenbezogener Daten mit dem Ziel, ihre künftige Verarbeitung einzuschränken; -

-4) "Profiling" jede Art der automatisierten Verarbeitung personenbezogener Daten, die darin besteht, dass diese personenbezogenen Daten verwendet werden, um bestimmte persönliche Aspekte, die sich auf eine natürliche Person beziehen, zu bewerten, insbesondere um Aspekte bezüglich Arbeitsleistung, wirtschaftliche Lage, Gesundheit, persönliche Vorlieben, Interessen, Zuverlässigkeit, Verhalten, Aufenthaltsort oder Ortswechsel dieser natürlichen Person zu analysieren oder vorherzusagen; -

-5) "Pseudonymisierung" die Verarbeitung personenbezogener Daten in einer Weise, dass die personenbezogenen Daten ohne Hinzuziehung zusätzlicher Informationen nicht mehr einer spezifischen betroffenen Person zugeordnet werden können, sofern diese zusätzlichen Informationen gesondert aufbewahrt werden und technischen und organisatorischen Maßnahmen unterliegen, die gewährleisten, dass die personenbezogenen Daten nicht einer identifizierten oder identifizierbaren natürlichen Person zugewiesen werden; -

-6) „Verantwortliche“ die natürliche oder juristische Person, Behörde, Einrichtung oder andere Stelle, die allein oder gemeinsam mit anderen über die Zwecke und Mittel der Verarbeitung von personenbezogenen Daten entscheidet; sind die Zwecke und Mittel dieser Verarbeitung durch das Unionsrecht oder das Recht der Mitgliedstaaten vorgegeben, so kann der Verantwortliche beziehungsweise können die bestimmten Kriterien seiner Benennung nach dem Unionsrecht oder dem Recht der Mitgliedstaaten vorgesehen werden -

-7) „Auftragsverarbeiter“ eine natürliche oder juristische Person, Behörde, Einrichtung oder andere Stelle, die personenbezogene Daten im Auftrag des Verantwortlichen verarbeitet; -

-8) „Empfänger“ eine natürliche oder juristische Person, Behörde, Einrichtung oder andere Stelle, der personenbezogene Daten offengelegt werden, unabhängig davon, ob es sich bei ihr um einen Dritten handelt oder nicht. Behörden, die im Rahmen eines bestimmten Untersuchungsauftrags nach dem Unionsrecht oder dem Recht der Mitgliedstaaten möglicherweise personenbezogene Daten erhalten, gelten jedoch nicht als Empfänger; die Verarbeitung dieser Daten durch die genannten Behörden erfolgt im Einklang mit den geltenden Datenschutzvorschriften gemäß den Zwecken der Verarbeitung; -

-9) „Dritter“ eine natürliche oder juristische Person, Behörde, Einrichtung oder andere Stelle, außer der betroffenen Person, dem Verantwortlichen, dem Auftragsverarbeiter und den Personen, die unter der unmittelbaren Verantwortung des Verantwortlichen oder des Auftragsverarbeiters befugt sind, die personenbezogenen Daten zu verarbeiten; -

-10) „Einwilligung“ der betroffenen Person jede freiwillig für den bestimmten Fall, in informierter Weise und unmissverständlich abgegebene Willensbekundung in Form einer Erklärung oder einer sonstigen eindeutigen bestätigenden Handlung, mit der die betroffene Person zu verstehen gibt, dass sie mit der Verarbeitung der sie betreffenden personenbezogenen Daten einverstanden ist; -

-11) „Verletzung des Schutzes personenbezogener Daten“ eine Verletzung der Sicherheit, die, ob unbeabsichtigt oder unrechtmäßig, zur Vernichtung, zum Verlust, zur Veränderung, oder zur unbefugten Offenlegung von beziehungsweise zum unbefugten Zugang zu personenbezogenen Daten führt, die übermittelt, gespeichert oder auf sonstige Weise verarbeitet wurden. -

-II. Verantwortlicher -
-Verantwortlicher im Sinne der Datenschutz-Grundverordnung sowie der in den Mitgliedstaaten der Europäischen Union geltenden Datenschutzgesetze und anderer datenschutzrechtlicher Bestimmungen ist: -

-mivita e.K.
-Herr Alois Ried
-Leinfeld 2
-87755 Kirchhaslach
-Telefon: +49 (0) 8333 946 17 67
-Mail: info@mivita.care
-

-III. Cookies -
-Unsere Website verwendet Cookies. Cookies sind kleine Textdateien, die über einen Internetbrowser auf einem Computersystem abgelegt und gespeichert werden. -
-Zahlreiche Websites und Server verwenden Cookies. Viele Cookies enthalten eine sogenannte Cookie-ID. Eine Cookie-ID ist eine eindeutige Kennung des Cookies. Sie besteht aus einer Zeichenfolge, durch die Websites und Server dem konkreten Internetbrowser zugeordnet werden können, in dem das Cookie gespeichert wurde. Dies ermöglicht es den besuchten Websites und Servern, den individuellen Browser der betroffenen Person von anderen Internetbrowsern, die andere Cookies enthalten, zu unterscheiden. Ein bestimmter Internetbrowser kann über die eindeutige Cookie-ID wiedererkannt und identifiziert werden. -
-Durch den Einsatz von Cookies können wir Ihnen nutzerfreundlichere Services bereitstellen, die ohne die Cookie-Setzung nicht möglich wären. -
-Mittels eines Cookies können die Informationen und Angebote auf unserer Website im Sinne des Benutzers optimiert werden. Cookies ermöglichen uns, wie bereits erwähnt, die Benutzer unserer Website wiederzuerkennen. Zweck dieser Wiedererkennung ist es, Ihnen die Verwendung unserer Websites zu erleichtern. Der Benutzer einer Website, die Cookies verwendet, muss beispielsweise nicht bei jedem Besuch der Internetseite erneut seine Zugangsdaten eingeben, weil dies von der Internetseite und dem auf dem Computersystem des Benutzers abgelegten Cookie übernommen wird. -
-Die durch Cookies verarbeiteten Daten sind für die genannten Zwecke zur Wahrung unserer berechtigten Interessen nach Art. 6 Abs. 1 S. 1 lit. f DSGVO erforderlich. -
-Sie können die Setzung von Cookies durch unsere Website jederzeit mittels einer entsprechenden Einstellung des genutzten Internetbrowsers verhindern und damit der Setzung von Cookies dauerhaft widersprechen. Ferner können bereits gesetzte Cookies jederzeit über einen Internetbrowser oder andere Softwareprogramme gelöscht werden. Dies ist in allen gängigen Internetbrowsern möglich. Sollten Sie die Setzung von Cookies in dem von Ihnen genutzten Internetbrowser deaktiveren, sind unter Umständen nicht alle Funktionen unserer Website vollumfänglich nutzbar. -

-IV. Daten und Informationen, die beim Aufruf unserer Website gespeichert werden -
-Bei jedem Aufruf unserer Website werden allgemeine Daten und Informationen erfasst, die in den Logfiles des Servers gespeichert werden. -

-Folgende Daten/Informationen können erfasst werden: -
-- die verwendeten Browsertypen und Versionen -- das verwendete Betriebssystem, -- die Website, von der Sie auf unsere Website gelangen -- die Unterwebsites, die auf unserer Website angesteuert werden -- das Datum und die Uhrzeit des Zugriffs auf unsere Website, -- Ihre IP-Adresse -- Ihr Internet-Service-Provider -- sonstige ähnliche Daten und Informationen, die der Gefahrenabwehr im Falle von Angriffen auf unsere IT-Systeme dienen. -

-Wir benötigen diese Informationen, um die Inhalte unserer Website zutreffend bereitstellen zu können. die dauerhafte Funktionsfähigkeit unseres IT-Systems gewährleisten zu können und um im Falle eines Cyberangriffes den Behörden die zu einer Strafverfolgung notwendigen Informationen bereitstellen zu können. Hierin liegt auch unser berechtigtes Interesse im Rahmen der Rechtsgrundlage für die Verarbeitung dieser Daten gemäß Art. 6 Abs. 1 lit. f DSGVO. Bei der Nutzung dieser allgemeinen Daten und Informationen ziehen wir keine Rückschlüsse auf die betroffene Person. Die anonymen Daten der Server-Logfiles speichern wir getrennt von allen personenbezogenen Daten. -V. Elektronische Kontaktaufnahme mit uns -

-Aufgrund der Regelungen des Telemediengesetzes (TMG) sind wir zur Angabe einer allgemeinen Mailadresse im Impressum unserer Website verpflichtet, über die Sie uns per Mail kontaktieren können. Weiterhin haben Sie die Möglichkeit, über Kontaktformulare auf unserer Website Kontakt mit uns aufzunehmen. Über die Kontaktformulare können Sie u.a. Anfragen zu den Produkten oder unserem Geschäft stellen bzw. sich als Berater bei uns bewerben. Die von Ihnen per Mail oder unsere Kontaktformulare an uns übermittelten personenbezogenen Daten werden automatisch für Zwecke der Bearbeitung oder der Kontaktaufnahme zu Ihnen gespeichert. -

-Mit Absenden Ihrer Nachricht willigen Sie in die Verarbeitung der übermittelten Daten ein. Die Verarbeitung erfolgt auf Grundlage des Art. 6 Abs. 1 lit. a DSGVO mit Ihrer Einwilligung. Sie können Ihre Einwilligung jederzeit durch Mitteilung an uns widerrufen, ohne dass die Rechtmäßigkeit der aufgrund der Einwilligung bis zum Widerruf erfolgten Verarbeitung berührt wird. Ihre E-Mail-Adresse nutzen wir nur zur Bearbeitung Ihrer Anfrage. Ihre Daten werden anschließend gelöscht, sofern Sie der weitergehenden Verarbeitung und Nutzung nicht zugestimmt haben. -

-VI. Rechtsgrundlagen der Verarbeitung -
-Sofern wir bei Ihnen eine Einwilligung für einen bestimmten Verarbeitungszweck einholen, dient uns Art. 6 I lit. a DSGVO als Rechtsgrundlage für den Verarbeitungsvorgang. -

-Sofern die Verarbeitung personenbezogener Daten zur Erfüllung eines Vertrags erforderlich ist, beruht die Verarbeitung auf Art. 6 I lit. b DSGVO. Dies gilt ebenfalls für Verarbeitungsvorgänge, die zur Durchführung vorvertraglicher Maßnahmen erforderlich sind, etwa bei Anfragen zur unseren Produkten oder sonstigen Leistungen. -

-Sofern wir einer rechtlichen Verpflichtung unterliegen, durch die eine Verarbeitung von personenbezogenen Daten erforderlich wird, wie beispielsweise zur Erfüllung steuerlicher Pflichten, so ist Rechtsgrundlage für die Verarbeitung Art. 6 I lit. c DSGVO. -

-Sofern die Verarbeitung von personenbezogenen Daten erforderlich wird, um lebenswichtige Interessen der betroffenen Person oder einer anderen natürlichen Person zu schützen, würde die Verarbeitung auf Art. 6 I lit. d DSGVO beruhen. -

-Letztlich kann Art. 6 I lit. f DSGVO Rechtsgrundlage für einen Verarbeitungsvorgang sein. Dies ist dann der Fall, wenn der Verarbeitungsvorgang von keiner der vorgenannten Rechtsgrundlagen erfasst wird und die Verarbeitung zur Wahrung eines berechtigten Interesses unseres Unternehmens oder eines Dritten erforderlich ist, sofern die Interessen, Grundrechte und Grundfreiheiten des Betroffenen nicht überwiegen. Basiert die Verarbeitung personenbezogener Daten auf Artikel 6 I lit. f DSGVO ist unser berechtigtes Interesse die Durchführung unserer Geschäftstätigkeit zugunsten des Wohlergehens unserer Mitarbeiter/Anteilseigner. -

-VII. Gesetzliche oder vertragliche Vorschriften zur Bereitstellung der personenbezogenen Daten -
-Die Bereitstellung personenbezogener Daten ist zum Teil gesetzlich vorgeschrieben ist (z.B. Steuervorschriften) und kann sich auch aus vertraglichen Regelungen (z.B. Angaben zum Vertragspartner) ergeben. Für den Fall, dass Sie einen Vertrag mit uns abschließen wollen, ist es erforderlich, dass Sie uns personenbezogene Daten zur Verfügung stellen, die in der Folge durch uns verarbeitet werden. Eine Nichtbereitstellung der personenbezogenen Daten hätte zur Folge, dass wir keinen Vertrag mit Ihnen schließen können. -

-VIII. Routinemäßige Löschung/Sperrung von personenbezogenen Daten -
-Wir verarbeiten und speichern personenbezogene Daten nur für den Zeitraum, der zur Erreichung des Speicherungszwecks erforderlich ist oder sofern dies durch den Europäischen Richtlinien- und Verordnungsgeber oder einen anderen Gesetzgeber in Gesetzen oder Vorschriften vorgesehen wurde. Entfällt der Speicherungszweck oder läuft eine vom Europäischen Richtlinien- und Verordnungsgeber oder einem anderen zuständigen Gesetzgeber vorgeschriebene Speicherfrist ab, werden die personenbezogenen Daten routinemäßig und entsprechend den gesetzlichen Vorschriften gesperrt oder gelöscht. -

-Nach Ablauf der jeweiligen gesetzlichen Aufbewahrungsfrist werden die entsprechenden Daten routi-nemäßig gelöscht, sofern sie nicht mehr zur Vertragserfüllung oder Vertragsanbahnung erforderlich sind. Nach den gesetzlichen Vorgaben in Deutschland erfolgt die Aufbewahrung insbesondere für 10 Jahre gemäß §§ 147 Abs. 1 AO, 257 Abs. 1 Nr. 1 und 4, Abs. 4 HGB (Bücher, Aufzeichnungen, Lageberichte, Buchungsbelege, Handelsbücher, für Besteuerung relevanter Unterlagen, etc.) und 6 Jahre gemäß § 257 Abs. 1 Nr. 2 und 3, Abs. 4 HGB (Handelsbriefe). -

-IX. Ihre Rechte -
-1) Bestätigungs- und Auskunftsrecht -
-Sie haben das Recht, von uns eine Bestätigung darüber zu verlangen, ob betreffende personenbezogene Daten verarbeitet werden. Möchten Sie Recht in Anspruch nehmen, können sie sich hierzu jederzeit an uns wenden. -

-Sie haben weiterhin das Recht, von uns unentgeltliche Auskunft über die zu Ihrer Person gespeicherten personenbezogenen Daten und eine Kopie dieser Auskunft zu erhalten. Ferner steht Ihnen ein Auskunftsanspruch über folgende Informationen zu: -
-- die Verarbeitungszwecke -- die Kategorien personenbezogener Daten, die verarbeitet werden -- die Empfänger oder Kategorien von Empfängern, gegenüber denen die personenbezogenen Daten offengelegt worden sind oder noch offengelegt werden, insbesondere bei Empfängern in Drittländern oder bei internationalen Organisationen -- falls möglich die geplante Dauer, für die die personenbezogenen Daten gespeichert werden, oder, falls dies nicht möglich ist, die Kriterien für die Festlegung dieser Dauer -- das Bestehen eines Rechts auf Berichtigung oder Löschung der sie betreffenden personenbezogenen Daten oder auf Einschränkung der Verarbeitung durch den Verantwortlichen oder eines Widerspruchsrechts gegen diese Verarbeitung -- das Bestehen eines Beschwerderechts bei einer Aufsichtsbehörde -- wenn die personenbezogenen Daten nicht bei der betroffenen Person erhoben werden: Alle verfügbaren Informationen über die Herkunft der Daten -- das Bestehen einer automatisierten Entscheidungsfindung einschließlich Profiling gemäß Artikel 22 Abs.1 und 4 DSGVO und - zumindest in diesen Fällen - aussagekräftige Informationen über die involvierte Logik sowie die Tragweite und die angestrebten Auswirkungen einer derartigen Verarbeitung für die betroffene Person -

-Ferner steht Ihnen ein Auskunftsrecht darüber zu, ob personenbezogene Daten an ein Drittland oder an eine internationale Organisation übermittelt wurden. Sofern dies der Fall ist, so steht Ihnen im Übrigen das Recht zu, Auskunft über die geeigneten Garantien im Zusammenhang mit der Übermittlung zu erhalten. -

-Möchten Sie dieses Auskunftsrecht in Anspruch nehmen, können sie sich hierzu jederzeit an uns wenden. -

-2) Recht auf Berichtigung -
-Sie haben das Recht, die unverzügliche Berichtigung sie betreffender unrichtiger personenbezogener Daten zu verlangen. Ferner steht Ihnen das Recht zu, unter Berücksichtigung der Zwecke der Verarbeitung, die Vervollständigung unvollständiger personenbezogener Daten - auch mittels einer ergänzenden Erklärung - zu verlangen. -

-Möchten Sie dieses Berichtigungsrecht in Anspruch nehmen, können sie sich hierzu jederzeit an uns wenden. -

-3) Recht auf Löschung („Recht auf „Vergessenwerden“) -
-Sie haben das Recht, von uns zu verlangen, dass die sie betreffenden personenbezogenen Daten unverzüglich gelöscht werden, sofern einer der folgenden Gründe zutrifft und soweit die Verarbeitung nicht erforderlich ist: -
-- Die personenbezogenen Daten wurden für solche Zwecke erhoben oder auf sonstige Weise verarbeitet, für welche sie nicht mehr notwendig sind; -- Sie widerrufen ihre Einwilligung, auf die sich die Verarbeitung gemäß Art. 6 Abs. 1 Buchstabe a DSGVO oder Art. 9 Abs. 2 Buchstabe a DSGVO stützte, und es fehlt an einer anderweitigen Rechtsgrundlage für die Verarbeitung; -- Sie legen gemäß Art. 21 Abs. 1 DSGVO Widerspruch gegen die Verarbeitung ein, und es liegen keine vorrangigen berechtigten Gründe für die Verarbeitung vor, oder Sie legen gemäß Art. 21 Abs. 2 DSGVO Widerspruch gegen die Verarbeitung ein; -- Die personenbezogenen Daten wurden unrechtmäßig verarbeitet; -- Die Löschung der personenbezogenen Daten ist zur Erfüllung einer rechtlichen Verpflichtung nach dem Unionsrecht oder dem Recht der Mitgliedstaaten erforderlich, dem wir unterliegen. -- Die personenbezogenen Daten wurden in Bezug auf angebotene Dienste der Informationsgesellschaft gemäß Art. 8 Abs. 1 DSGVO erhoben. -

-Sofern einer der oben genannten Gründe zutrifft und Sie die Löschung von personenbezogenen Daten, die bei uns gespeichert sind, veranlassen möchten, können sie sich hierzu jederzeit an uns wenden. Wir werden veranlassen, dass dem Löschverlangen unverzüglich nachgekommen wird. -
-Wurden die personenbezogenen Daten von uns öffentlich gemacht und sind wir als Verantwortlicher gemäß Art. 17 Abs. 1 DSGVO zur Löschung der personenbezogenen Daten verpflichtet, so treffen wir unter Berücksichtigung der verfügbaren Technologie und der Implementierungskosten angemessene Maßnahmen, auch technischer Art, um andere für die Datenverarbeitung Verantwortliche, welche die veröffentlichten personenbezogenen Daten verarbeiten, darüber in Kenntnis zu setzen, dass Sie von diesen anderen für die Datenverarbeitung Verantwortlichen die Löschung sämtlicher Links zu diesen personenbezogenen Daten oder von Kopien oder Replikationen dieser personenbezogenen Daten verlangt haben, soweit die Verarbeitung nicht erforderlich ist. Wir werden im Einzelfall das Notwendige veranlassen. -

-4) Recht auf Einschränkung der Verarbeitung -
-Sie haben das Recht, von uns die Einschränkung der Verarbeitung zu verlangen, wenn eine der folgenden Voraussetzungen gegeben ist: -
-- Die Richtigkeit der personenbezogenen Daten wird von Ihnen bestritten, und zwar für eine Dauer, die es uns ermöglicht, die Richtigkeit der personenbezogenen Daten zu überprüfen; -- Die Verarbeitung ist unrechtmäßig, Sie lehnen die Löschung der personenbezogenen Daten ab und verlangen stattdessen die Einschränkung der Nutzung der personenbezogenen Daten; -- Wir benötigen die personenbezogenen Daten für die Zwecke der Verarbeitung nicht länger, Sie benötigen sie jedoch zur Geltendmachung, Ausübung oder Verteidigung von Rechtsansprüchen; -- Sie haben Widerspruch gegen die Verarbeitung gem. Art. 21 Abs. 1 DSGVO eingelegt und es steht noch nicht fest, ob unsere berechtigten Gründe gegenüber Ihren überwiegen. -
-Sofern eine der oben genannten Voraussetzungen gegeben ist und Sie die Einschränkung von personenbezogenen Daten, die bei uns gespeichert sind, verlangen möchten, können Sie sich hierzu jederzeit an uns wenden. Wir werden die Einschränkung der Verarbeitung veranlassen. -

-5) Recht auf Datenübertragbarkeit -
-Sie haben das Recht, von uns die sie betreffenden personenbezogenen Daten, welche von Ihnen bereitgestellt wurden, in einem strukturierten, gängigen und maschinenlesbaren Format zu erhalten. Sie haben außerdem das Recht, diese Daten einem anderen Verantwortlichen ohne Behinderung durch uns zu übermitteln, sofern die Verarbeitung auf der Einwilligung gemäß Art. 6 Abs. 1 Buchstabe a DSGVO oder Art. 9 Abs. 2 Buchstabe a DSGVO oder auf einem Vertrag gemäß Art. 6 Abs. 1 Buchstabe b DSGVO beruht und die Verarbeitung mithilfe automatisierter Verfahren erfolgt, sofern die Verarbeitung nicht für die Wahrnehmung einer Aufgabe erforderlich ist, die im öffentlichen Interesse liegt oder in Ausübung öffentlicher Gewalt erfolgt, welche uns übertragen wurde. -

-Ferner haben Sie bei der Ausübung ihres Rechts auf Datenübertragbarkeit gemäß Art. 20 Abs. 1 DSGVO das Recht, zu erwirken, dass die personenbezogenen Daten direkt von uns an einen anderen Verantwortlichen übermittelt werden, soweit dies technisch machbar ist und sofern hiervon nicht die Rechte und Freiheiten anderer Personen beeinträchtigt werden. -

-Zur Geltendmachung des Rechts auf Datenübertragbarkeit können Sie sich jederzeit an uns wenden. -

-6) Recht auf Widerspruch -
-Sie haben das Recht, aus Gründen, die sich aus ihrer besonderen Situation ergeben, jederzeit gegen die Verarbeitung sie betreffender personenbezogener Daten, die aufgrund von Art. 6 Abs. 1 Buchstaben e oder f DSGVO erfolgt, Widerspruch einzulegen. Dies gilt auch für ein auf diese Bestimmungen gestütztes Profiling. -

-Wir verarbeiten die personenbezogenen Daten im Falle des Widerspruchs nicht mehr, es sei denn, wir können zwingende schutzwürdige Gründe für die Verarbeitung nachweisen, die Ihre Interessen, Rechte und Freiheiten überwiegen, oder die Verarbeitung dient der Geltendmachung, Ausübung oder Verteidigung von Rechtsansprüchen. -
-Verarbeiten wir personenbezogene Daten, um Direktwerbung zu betreiben, so haben Sie das Recht, jederzeit Widerspruch gegen die Verarbeitung der personenbezogenen Daten zum Zwecke derartiger Werbung einzulegen. Dies gilt auch für das Profiling, soweit es mit solcher Direktwerbung in Verbindung steht. Widersprechen Sie der Verarbeitung für Zwecke der Direktwerbung, so werden wir die personenbezogenen Daten nicht mehr für diese Zwecke verarbeiten. -

-Zudem haben Sie das Recht, aus Gründen, die sich aus ihrer besonderen Situation ergeben, gegen die sie betreffende Verarbeitung personenbezogener Daten, die bei uns zu wissenschaftlichen oder historischen Forschungszwecken oder zu statistischen Zwecken gemäß Art. 89 Abs. 1 DSGVO erfolgen, Widerspruch einzulegen, es sei denn, eine solche Verarbeitung ist zur Erfüllung einer im öffentlichen Interesse liegenden Aufgabe erforderlich. -

-Zur Ausübung des Rechts auf Widerspruch können Sie sich an uns wenden. Es steht Ihnen frei, im Zusammenhang mit der Nutzung von Diensten der Informationsgesellschaft, ungeachtet der Richtlinie 2002/58/EG, ihr Widerspruchsrecht mittels automatisierter Verfahren auszuüben, bei denen technische Spezifikationen verwendet werden. -

-7) Automatisierte Entscheidungen im Einzelfall einschließlich Profiling -
-Sie haben das Recht, nicht einer ausschließlich auf einer automatisierten Verarbeitung - einschließlich Profiling - beruhenden Entscheidung unterworfen zu werden, die Ihnen gegenüber rechtliche Wirkung entfaltet oder sie in ähnlicher Weise erheblich beeinträchtigt, sofern die Entscheidung nicht für den Abschluss oder die Erfüllung eines Vertrags zwischen Ihnen und uns erforderlich ist, oder aufgrund von Rechtsvorschriften der Union oder der Mitgliedstaaten, denen wir unterliegen, zulässig ist und diese Rechtsvorschriften angemessene Maßnahmen zur Wahrung Ihrer Rechte und Freiheiten enthalten oder mit Ihrer ausdrücklicher Einwilligung erfolgt. -

-Ist die Entscheidung für den Abschluss oder die Erfüllung eines Vertrags zwischen Ihnen und uns erforderlich oder erfolgt sie mit Ihrer ausdrücklicher Einwilligung, treffen wir angemessene Maßnahmen, um Ihre Rechte und Freiheiten sowie Ihre berechtigten Interessen zu wahren, wozu mindestens das Recht auf Erwirkung des Eingreifens einer Person seitens des Verantwortlichen, auf Darlegung des eigenen Standpunkts und auf Anfechtung der Entscheidung gehört. -

-Möchten Sie Rechte mit Bezug auf automatisierte Entscheidungen geltend machen, können Sie sich hierzu jederzeit an uns wenden. -

-8) Recht auf Widerruf einer datenschutzrechtlichen Einwilligung -
-Sie haben das Recht, eine Einwilligung zur Verarbeitung personenbezogener Daten jederzeit zu widerrufen. -Möchten Sie Ihr Recht auf Widerruf einer Einwilligung geltend machen, können Sie sich hierzu jederzeit an uns wenden. -

-9) Beschwerderecht bei der Aufsichtsbehörde -
-Sie haben gemäß Art. 77 DSGVO das Recht, sich bei der Aufsichtsbehörde zu beschweren, wenn Sie der Ansicht sind, dass die Verarbeitung Ihrer personenbezogenen Daten nicht rechtmäßig erfolgt. -

-X. Zusammenarbeit mit Auftragsverarbeitern/Dritten -
-Soweit wir im Rahmen unserer Datenverarbeitung Ihre Daten gegenüber anderen Personen/Unternehmen offenbaren, an diese übermitteln oder diesen Zugriff auf Ihre Daten gewähren, erfolgt dies ausschließlich auf Grundlage einer gesetzlichen Erlaubnis, Ihrer Einwilligung, einer rechtlichen Verpflichtung oder auf Grundlage unserer berechtigten Interessen. Wenn Dritte von uns mit der Verarbeitung von Daten auf Grundlage eines so genannten „Auftragsverarbeitungsvertrages“ beauftragt worden sind bzw. werden, geschieht dies auf Grundlage des Art. 28 DSGVO. -

-XI. Übermittlungen in Drittländer -
-Soweit wir Daten in einem Drittland verarbeiten oder dies im Rahmen der Inanspruchnahme von Diensten Dritter geschieht, erfolgt dies nur, wenn es zur Erfüllung unserer (vor)vertraglichen Pflichten, auf Grundlage Ihrer Einwilligung, aufgrund einer rechtlichen Verpflichtung oder auf Grundlage unserer berechtigten Interessen geschieht. Vorbehaltlich gesetzlicher oder vertraglicher Erlaubnisse verarbeiten oder lassen wir die Daten in einem Drittland nur beim Vorliegen der besonderen Voraussetzungen der Art. 44 ff. DSGVO verarbeiten. Dementsprechend erfolgt die Verarbeitung z.B. auf Grundlage besonderer Garantien, wie der offiziell anerkannten Feststellung eines der EU entsprechenden Datenschutzniveaus (z.B. für die USA durch das „Privacy Shield“) oder Beachtung offiziell anerkannter spezieller vertraglicher Verpflichtungen (so genannte „Standardvertragsklauseln“). -

-XII. Einbindung von Diensten und Inhalten Dritter -
-Wir setzen auf unserer Website basierend auf unseren berechtigten Interessen im Sinne des Art. 6 Abs. 1 lit. f. DSGVO Angebote von Drittanbietern ein, um deren Inhalte einbinden zu können. Die Anbieter dieser Inhalte erhalten Kenntnis über Ihre IP-Adresse, da ohne die Kenntnis über die IP-Adresse die Inhalte nicht an Ihren Browser übermittelt werden können. Hierbei bemühen wir uns, nur solche Inhalte von Drittanbietern zu verwenden, bei denen Ihre IP-Adresse ausschließlich zur Auslieferung der Inhalte verwendet wird. Es besteht weiterhin die Möglichkeit, dass Drittanbieter so genannte „Pixel-Tags“ - dies sind unsichtbare Grafiken, die auch als "Web Beacons" bezeichnet werden - für statistische oder Marketingzwecke verwenden. "Pixel-Tags" können Informationen, wie zum Beispiel den Besucherverkehr auf unserer Website, auswerten. -

-Nachfolgend geben wir Ihren eine Übersicht zu den von uns verwendeten Angeboten von Drittanbietern nebst Links zu deren Datenschutzerklärungen: -

-Externe Schriftarten von Google, LLC., https://www.google.com/fonts („Google Fonts“). Die Einbindung der Google Fonts erfolgt durch einen Serveraufruf bei Google (in der Regel in den USA). Die Datenschutzerklärung finden Sie hier: https://policies.google.com/privacy, Opt-Out: https://adssettings.google.com/authenticated -

-Videos der Plattform “YouTube” des Drittanbieters Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA. Die Datenschutzerklärung finden Sie hier: https://policies.google.com/privacy, Opt-Out: https://adssettings.google.com/authenticated -

- - - -Stand: 01.10.2018 -

-
- -
-
- -@endsection \ No newline at end of file diff --git a/resources/views/web/templates/erreichbarkeit.blade.php b/resources/views/web/templates/erreichbarkeit.blade.php deleted file mode 100644 index deb70c9f..00000000 --- a/resources/views/web/templates/erreichbarkeit.blade.php +++ /dev/null @@ -1,80 +0,0 @@ -@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') - -@section('content') - -
-
- -
-
-
- - -
-
- -
- -
-

Erreichbarkeit mit Familie & Privatem

- -
- -
- service -

Nesciunt tofu stumptown aliqua, retro synth master cleanse.

-
- -
- - - - - - - - - - - - - - - - - - - - - -

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

-
-
- -
-
-
- -
-

Mache Menschen glücklich ....

-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.

- -
- - @include('web.templates._content_contact') -
- - - -
- @include('web.templates._bcategories') -
- - -
- -
-
- - -@endsection \ No newline at end of file diff --git a/resources/views/web/templates/impressum.blade.php b/resources/views/web/templates/impressum.blade.php deleted file mode 100644 index 28455006..00000000 --- a/resources/views/web/templates/impressum.blade.php +++ /dev/null @@ -1,44 +0,0 @@ -@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') - -@section('content') -
-
- -
-

{{ __('website.impress') }}11

-
- -

- {{ __('website.contact_address') }}
- {{ __('website.phone_number') }}
- {{ __('website.email') }}: {{ __('website.email_address') }}
- - - -

Geschäftsinhaber:
Alois Ried

- - Registergericht:
Memmingen

- - Registernummer:
HRA 12236

- - USt-ID-Nr.:
DE 244162340

-
-

Support mivita:
- Telefon: +49 (0) 8333 946 17 67
- E-Mail:: info@mivita.care

- -
-
-

Nutzungshinweis: -
Eine unerlaubte Verwendung, Reproduktion, Weitergabe, Veröffentlichungen oder eine kommerzielle Nutzung ohne Genehmigung des Urhebers der auf dieser Website befindlichen Inhalte ist untersagt und wird sowohl straf- als auch zivilrechtlich verfolgt!

-
- Online-Streitbeilegung: -
gemäß Art. 14 Abs. 1 ODR-VO: Die Europäische Kommission stellt eine Plattform zur Online-Streitbeilegung (OS) bereit, die Sie hier finden http://ec.europa.eu/consumers/odr/. - -
- -
-
- - -@endsection \ No newline at end of file diff --git a/resources/views/web/templates/partner.blade.php b/resources/views/web/templates/partner.blade.php deleted file mode 100644 index 11a29ed5..00000000 --- a/resources/views/web/templates/partner.blade.php +++ /dev/null @@ -1,85 +0,0 @@ -@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') - -@section('content') - - - - -
-
- -
-
-
- - - - - -
-
-
-

Partner

-
-

Neben Studenten, Berufseinsteigern, jungen Eltern und alleinerziehenden Müttern bzw. Vätern besteht das MIVITA Vertriebsteam auch aus Unternehmern, die schon vor dem Schritt in den Direktvertrieb ihre Zukunft in die eigenen Hände gelegt haben. So liegt es nahe, dass wir mit diesen Dienstleistern, die unsere Arbeit und den Markt am besten verstehen, auch geschäftlich zusammenarbeiten. Ob Werbemittel wie Autobeschriftung, Flyer, Webdesign, Reisen etc. - wir bauen auch diese Infrastruktur weiter aus, so dass Du Zugriff auf die unterschiedlichsten Dienstleister hast, die Dir maßgeschneidert in Dein eigenes Business helfen.

- -
- -
- -
-
- MIVITA Fahrzeugbeschriftung -
-
-

Autobeschriftung vom Fachmann

-

Nutze Dein Auto als Werbefläche und mache auf Dich und Dein Produkt aufmerksam. Du möchtest das MIVITA Logo auf Deinem Auto oder hast eine ganz konkrete Vorstellung? Kein Problem. Kontaktiere unseren Vertriebspartner Stefan, der Dich gerne dazu berät:

- - DV Dienstleistungsservice
- Stefan Del Vecchio
- Steinstraße.33
- 51702 Bergneustadt -

- DV.Dienstleistungsservice@web.de
- Festnetz: +49 2261 912 36 26
- Mobil: +49 174 525 69 00 -



- -
-
-
-
- MIVITA Reisen by NETWORKTRIPS -
-
-

MIVITA Reisen by NETWORKTRIPS

-

Wir legen jedem Berater ans Herz, mit uns gemeinsam die Aloe Vera Schulung auf Mallorca zu erleben. Hierzu haben wir für Euch gemeinsam mit unserem Reise-Portal NETWORKTRIPS und angeschlossenem Reisebüro STERN TOURS in Berlin verschiedene Buchungsmöglichkeiten für

- - • Nur-Hotel
- • Hotel & Flug
- • Event-Package
-
- vorbereitet. Dieses Portal ist nicht öffentlich und eine Registrierung kann nur über einen Einladungslink erfolgen. Bitte fragt Euren Sponsor oder in einer Eurer WhatsApp Gruppen nach.

- - NETWORTRIPS
- Ansprechpartner: Thomas Krummel
- www.networktrips.agency
- support@networktrips.agency
- Festnetz: +49 2203 186 90 14
- Mobil: +49 162 251 48 71 -



- -
-
- - -
-
- - - -@endsection \ No newline at end of file diff --git a/resources/views/web/templates/ueber-uns.blade.php b/resources/views/web/templates/ueber-uns.blade.php deleted file mode 100644 index 97b44b51..00000000 --- a/resources/views/web/templates/ueber-uns.blade.php +++ /dev/null @@ -1,167 +0,0 @@ -@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') - -@section('content') - -
-
- -
- - -
-
- - - - -
-
- -
- - -
- - -
-

Aloe Vera

-
- -

Die weltweit einmaligen und herausragenden Eigenschaften der Aloe Vera sind dem einzigartigen - Zusammenspiel und der Symbiose der unterschiedlichen Inhalts- und Wirkstoffe zu verdanken. Keine - andere bisher bekannte Pflanze verfügt über derart vielseitige Möglichkeiten der heilenden und - pflegenden Anwendung. Insgesamt sind in der medizinischen Literatur derzeit weit mehr als 250 - aktive Substanzen bekannt, und stetig werden neue entdeckt. Die Entschlüsselung des komplexen - Zusammenspiels aller Substanzen steht zwar erst ganz am Anfang, die Wirkungen sind inzwischen - aber sehr gut belegt.

- - -
- -
-
-

Herkunft unserer Aloe

-

Von des Deutschen liebster Urlaubsinsel

-
- -

Die Farm auf Mallorca hat eine Größe von etwa 40 Hektar. Dort werden die Aloe Vera - Pflanzen gezüchtet und gepflegt. Die 200.000 Pflanzen müssen mindestens 5 Jahre alt - sein, bis die Blätter geerntet werden können. Eine Pflanze benötigt mindestens 2.000 - Sonnenstunden im Jahr, um die wertvollen Nährstoffe für den Saft aufzubauen.

- - -
- -
-
-

100% BIO Qualität

-

Bio-zertifizierte Handarbeit aus Mallorca<

-
- -

Wir garantieren beste Qualität durch manuelle Produktion und biologische Inhaltsstoffe. - Das typische Klima von Mallorca fordert die Pflanzen heraus. Tests haben ergeben, dass - gerade dieses Klima optimal für eine perfekte Entwicklung der Pflanze ist.

- -
- -
- - -
- -
-

Mehrwerte?

-

why is different than any other template

-
-

Sed odio sit amet nibh vulputate cursus a sit amet mauris. Morbi accumsan ipsum velit. Nam - nec tellus a odio tincidunt auctor a ornare odio. Sed non mauris vitae erat consequat auctor - eu in elit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos - himenaeos. Nulla augue justo nibh ac diam.

- -
- -
-
    -
  • Nulla ipsum dolor lacus.
    • -
  • Quisque lorem tortor sed.
    • -
  • Aenean ligula non sagittis
    • -
  • Suspendisse a pellentesque.
    • -
  • Congue sodales nulla arcu.
    • -
-
- -
-
    -
  • Nulla ipsum dolor lacus.
    • -
  • Quisque lorem tortor sed.
    • -
  • Aenean ligula non sagittis
    • -
  • Suspendisse a pellentesque.
    • -
  • Congue sodales nulla arcu.
    • -
-
- -
-
    -
  • Nulla ipsum dolor lacus.
    • -
  • Quisque lorem tortor sed.
    • -
  • Aenean ligula non sagittis
    • -
  • Suspendisse a pellentesque.
    • -
  • Congue sodales nulla arcu.
    • -
-
- -
- -
- -
- - - -
- -
-
-

Auf einen Blick

-
-
    -
  • - - Surgery - lorem ipsum dolor sit amet -
    • -
  • - - Cardiology - lorem ipsum dolor sit amet -
    • -
  • - - Internal Medicine - lorem ipsum dolor sit amet -
    • -
  • - - Rehabilitation - lorem ipsum dolor sit amet -
    • -
- -
- -

Nullam id dolor id nibh ultricies vehicula ut id - elit. Integer posuere erat a ante venenatis.

-
- - -
- - -
- -
-
- - -@endsection \ No newline at end of file diff --git a/resources/views/web/user/layouts/includes/footer-checkout.blade.php b/resources/views/web/user/layouts/includes/footer-checkout.blade.php deleted file mode 100644 index 3d42b5bd..00000000 --- a/resources/views/web/user/layouts/includes/footer-checkout.blade.php +++ /dev/null @@ -1,183 +0,0 @@ - -
-
-
-
-

- {{ __('website.sales_partner_or_questions') }} -

- @if(Util::isCheckout()) - @if(isset($order_reference)) -

- {{ __('payment.back_to_shop') }} -

- @else -

- {{ __('website.contact_now') }} : {{ __('website.to_contact') }} -

- @endif - @else -

- {{ __('website.contact_now') }} : {{ __('website.to_contact') }} -

- @endif -
-
-
-
- - - - - -
-
- -
-
-
-
-
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
-
-
-
-
\ No newline at end of file diff --git a/resources/views/web/user/layouts/includes/footer-web.blade.php b/resources/views/web/user/layouts/includes/footer-web.blade.php deleted file mode 100644 index 3d42b5bd..00000000 --- a/resources/views/web/user/layouts/includes/footer-web.blade.php +++ /dev/null @@ -1,183 +0,0 @@ - -
-
-
-
-

- {{ __('website.sales_partner_or_questions') }} -

- @if(Util::isCheckout()) - @if(isset($order_reference)) -

- {{ __('payment.back_to_shop') }} -

- @else -

- {{ __('website.contact_now') }} : {{ __('website.to_contact') }} -

- @endif - @else -

- {{ __('website.contact_now') }} : {{ __('website.to_contact') }} -

- @endif -
-
-
-
- - - - - -
-
- -
-
-
-
-
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
-
-
-
-
\ No newline at end of file diff --git a/resources/views/web/user/layouts/includes/header-checkout.blade.php b/resources/views/web/user/layouts/includes/header-checkout.blade.php deleted file mode 100644 index 0ce1b4bc..00000000 --- a/resources/views/web/user/layouts/includes/header-checkout.blade.php +++ /dev/null @@ -1,297 +0,0 @@ - - -{{-- -@dump(session()->all()) - -@dump(Auth::guard('customers')->check()) - -@dump(Auth::guard('customers')->user()) - -@dump(Auth::guard('user')->check()) - -@dump(Auth::guard('user')->user()) - --}} \ No newline at end of file diff --git a/resources/views/web/user/layouts/includes/header-web.blade.php b/resources/views/web/user/layouts/includes/header-web.blade.php deleted file mode 100644 index 0ce1b4bc..00000000 --- a/resources/views/web/user/layouts/includes/header-web.blade.php +++ /dev/null @@ -1,297 +0,0 @@ - - -{{-- -@dump(session()->all()) - -@dump(Auth::guard('customers')->check()) - -@dump(Auth::guard('customers')->user()) - -@dump(Auth::guard('user')->check()) - -@dump(Auth::guard('user')->user()) - --}} \ No newline at end of file diff --git a/routes/domains/checkout.php b/routes/domains/checkout.php index 64c315a1..3c2e2bfa 100644 --- a/routes/domains/checkout.php +++ b/routes/domains/checkout.php @@ -19,6 +19,4 @@ Route::group(['middleware' => ['checkout']], function () { Route::get('/transaction/status/{status?}/{reference?}', 'Web\CheckoutController@transactionStatus')->name('checkout.transaction_status'); Route::post('/transaction/status/{status?}/{reference?}', 'Web\CheckoutController@transactionStatusPost')->name('checkout.transaction_status_post'); Route::get('/transaction/approved/{transactionId}/{reference}', 'Web\CheckoutController@transactionApproved')->name('checkout.transaction_approved'); - - // Catch-all Route für rechtliche Seiten wie /versandkosten, /zahlungsarten etc. }); \ No newline at end of file diff --git a/routes/domains/user-shop.php b/routes/domains/user-shop.php index 7293d960..aaef80da 100644 --- a/routes/domains/user-shop.php +++ b/routes/domains/user-shop.php @@ -5,15 +5,14 @@ | User-Shop Routes ({subdomain}.mivita.care) |-------------------------------------------------------------------------- */ -Route::get('/', 'Web\SiteController@index')->name('home'); -Route::get('/home', 'Web\SiteController@index')->name('home'); +Route::get('/', 'Web\SiteController@index')->name('user-shop.home'); +Route::get('/home', 'Web\SiteController@index')->name('user-shop.home.alt'); Route::get('/registrierung', 'Web\RegisterController@index')->name('user-shop.register_user'); Route::get('/reg/{member_id?}', 'Web\RegisterController@member')->name('user-shop.register_user_member'); Route::post('/registrierung', 'Web\RegisterController@register')->name('user-shop.register_user_post'); Route::get('/registrierung/finish', 'Web\RegisterController@finish')->name('user-shop.register_user_finish'); -Route::get('/', 'Web\SiteController@index')->name('user-shop.home'); Route::get('/user/card/add/{id}/{quantity?}/{product_slug?}', 'Web\CardController@addToCardGet')->name('user-shop.card_add_get'); Route::post('/user/card/add/{id}', 'Web\CardController@addToCardPost')->name('user-shop.card_add_post'); Route::get('/user/card/show', 'Web\CardController@showCard')->name('user-shop.card_show'); diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore old mode 100644 new mode 100755 diff --git a/storage/fonts/Courier-Bold.afm.php b/storage/fonts/Courier-Bold.afm.php deleted file mode 100644 index 9257a5dd..00000000 --- a/storage/fonts/Courier-Bold.afm.php +++ /dev/null @@ -1,572 +0,0 @@ - - array ( - 32 => 'space', - 160 => 'space', - 33 => 'exclam', - 34 => 'quotedbl', - 35 => 'numbersign', - 36 => 'dollar', - 37 => 'percent', - 38 => 'ampersand', - 146 => 'quoteright', - 40 => 'parenleft', - 41 => 'parenright', - 42 => 'asterisk', - 43 => 'plus', - 44 => 'comma', - 45 => 'hyphen', - 173 => 'hyphen', - 46 => 'period', - 47 => 'slash', - 48 => 'zero', - 49 => 'one', - 50 => 'two', - 51 => 'three', - 52 => 'four', - 53 => 'five', - 54 => 'six', - 55 => 'seven', - 56 => 'eight', - 57 => 'nine', - 58 => 'colon', - 59 => 'semicolon', - 60 => 'less', - 61 => 'equal', - 62 => 'greater', - 63 => 'question', - 64 => 'at', - 65 => 'A', - 66 => 'B', - 67 => 'C', - 68 => 'D', - 69 => 'E', - 70 => 'F', - 71 => 'G', - 72 => 'H', - 73 => 'I', - 74 => 'J', - 75 => 'K', - 76 => 'L', - 77 => 'M', - 78 => 'N', - 79 => 'O', - 80 => 'P', - 81 => 'Q', - 82 => 'R', - 83 => 'S', - 84 => 'T', - 85 => 'U', - 86 => 'V', - 87 => 'W', - 88 => 'X', - 89 => 'Y', - 90 => 'Z', - 91 => 'bracketleft', - 92 => 'backslash', - 93 => 'bracketright', - 94 => 'asciicircum', - 95 => 'underscore', - 145 => 'quoteleft', - 97 => 'a', - 98 => 'b', - 99 => 'c', - 100 => 'd', - 101 => 'e', - 102 => 'f', - 103 => 'g', - 104 => 'h', - 105 => 'i', - 106 => 'j', - 107 => 'k', - 108 => 'l', - 109 => 'm', - 110 => 'n', - 111 => 'o', - 112 => 'p', - 113 => 'q', - 114 => 'r', - 115 => 's', - 116 => 't', - 117 => 'u', - 118 => 'v', - 119 => 'w', - 120 => 'x', - 121 => 'y', - 122 => 'z', - 123 => 'braceleft', - 124 => 'bar', - 125 => 'braceright', - 126 => 'asciitilde', - 161 => 'exclamdown', - 162 => 'cent', - 163 => 'sterling', - 165 => 'yen', - 131 => 'florin', - 167 => 'section', - 164 => 'currency', - 39 => 'quotesingle', - 147 => 'quotedblleft', - 171 => 'guillemotleft', - 139 => 'guilsinglleft', - 155 => 'guilsinglright', - 150 => 'endash', - 134 => 'dagger', - 135 => 'daggerdbl', - 183 => 'periodcentered', - 182 => 'paragraph', - 149 => 'bullet', - 130 => 'quotesinglbase', - 132 => 'quotedblbase', - 148 => 'quotedblright', - 187 => 'guillemotright', - 133 => 'ellipsis', - 137 => 'perthousand', - 191 => 'questiondown', - 96 => 'grave', - 180 => 'acute', - 136 => 'circumflex', - 152 => 'tilde', - 175 => 'macron', - 168 => 'dieresis', - 184 => 'cedilla', - 151 => 'emdash', - 198 => 'AE', - 170 => 'ordfeminine', - 216 => 'Oslash', - 140 => 'OE', - 186 => 'ordmasculine', - 230 => 'ae', - 248 => 'oslash', - 156 => 'oe', - 223 => 'germandbls', - 207 => 'Idieresis', - 233 => 'eacute', - 159 => 'Ydieresis', - 247 => 'divide', - 221 => 'Yacute', - 194 => 'Acircumflex', - 225 => 'aacute', - 219 => 'Ucircumflex', - 253 => 'yacute', - 234 => 'ecircumflex', - 220 => 'Udieresis', - 218 => 'Uacute', - 203 => 'Edieresis', - 169 => 'copyright', - 229 => 'aring', - 224 => 'agrave', - 227 => 'atilde', - 154 => 'scaron', - 237 => 'iacute', - 251 => 'ucircumflex', - 226 => 'acircumflex', - 231 => 'ccedilla', - 222 => 'Thorn', - 179 => 'threesuperior', - 210 => 'Ograve', - 192 => 'Agrave', - 215 => 'multiply', - 250 => 'uacute', - 255 => 'ydieresis', - 238 => 'icircumflex', - 202 => 'Ecircumflex', - 228 => 'adieresis', - 235 => 'edieresis', - 205 => 'Iacute', - 177 => 'plusminus', - 166 => 'brokenbar', - 174 => 'registered', - 200 => 'Egrave', - 142 => 'Zcaron', - 208 => 'Eth', - 199 => 'Ccedilla', - 193 => 'Aacute', - 196 => 'Adieresis', - 232 => 'egrave', - 211 => 'Oacute', - 243 => 'oacute', - 239 => 'idieresis', - 212 => 'Ocircumflex', - 217 => 'Ugrave', - 254 => 'thorn', - 178 => 'twosuperior', - 214 => 'Odieresis', - 181 => 'mu', - 236 => 'igrave', - 190 => 'threequarters', - 153 => 'trademark', - 204 => 'Igrave', - 189 => 'onehalf', - 244 => 'ocircumflex', - 241 => 'ntilde', - 201 => 'Eacute', - 188 => 'onequarter', - 138 => 'Scaron', - 176 => 'degree', - 242 => 'ograve', - 249 => 'ugrave', - 209 => 'Ntilde', - 245 => 'otilde', - 195 => 'Atilde', - 197 => 'Aring', - 213 => 'Otilde', - 206 => 'Icircumflex', - 172 => 'logicalnot', - 246 => 'odieresis', - 252 => 'udieresis', - 240 => 'eth', - 158 => 'zcaron', - 185 => 'onesuperior', - 128 => 'Euro', - ), - 'isUnicode' => false, - 'FontName' => 'Courier-Bold', - 'FullName' => 'Courier Bold', - 'FamilyName' => 'Courier', - 'Weight' => 'Bold', - 'ItalicAngle' => '0', - 'IsFixedPitch' => 'true', - 'CharacterSet' => 'ExtendedRoman', - 'FontBBox' => - array ( - 0 => '-113', - 1 => '-250', - 2 => '749', - 3 => '801', - ), - 'UnderlinePosition' => '-100', - 'UnderlineThickness' => '50', - 'Version' => '003.000', - 'EncodingScheme' => 'WinAnsiEncoding', - 'CapHeight' => '562', - 'XHeight' => '439', - 'Ascender' => '629', - 'Descender' => '-157', - 'StdHW' => '84', - 'StdVW' => '106', - 'StartCharMetrics' => '317', - 'C' => - array ( - 32 => 600.0, - 160 => 600.0, - 33 => 600.0, - 34 => 600.0, - 35 => 600.0, - 36 => 600.0, - 37 => 600.0, - 38 => 600.0, - 146 => 600.0, - 40 => 600.0, - 41 => 600.0, - 42 => 600.0, - 43 => 600.0, - 44 => 600.0, - 45 => 600.0, - 173 => 600.0, - 46 => 600.0, - 47 => 600.0, - 48 => 600.0, - 49 => 600.0, - 50 => 600.0, - 51 => 600.0, - 52 => 600.0, - 53 => 600.0, - 54 => 600.0, - 55 => 600.0, - 56 => 600.0, - 57 => 600.0, - 58 => 600.0, - 59 => 600.0, - 60 => 600.0, - 61 => 600.0, - 62 => 600.0, - 63 => 600.0, - 64 => 600.0, - 65 => 600.0, - 66 => 600.0, - 67 => 600.0, - 68 => 600.0, - 69 => 600.0, - 70 => 600.0, - 71 => 600.0, - 72 => 600.0, - 73 => 600.0, - 74 => 600.0, - 75 => 600.0, - 76 => 600.0, - 77 => 600.0, - 78 => 600.0, - 79 => 600.0, - 80 => 600.0, - 81 => 600.0, - 82 => 600.0, - 83 => 600.0, - 84 => 600.0, - 85 => 600.0, - 86 => 600.0, - 87 => 600.0, - 88 => 600.0, - 89 => 600.0, - 90 => 600.0, - 91 => 600.0, - 92 => 600.0, - 93 => 600.0, - 94 => 600.0, - 95 => 600.0, - 145 => 600.0, - 97 => 600.0, - 98 => 600.0, - 99 => 600.0, - 100 => 600.0, - 101 => 600.0, - 102 => 600.0, - 103 => 600.0, - 104 => 600.0, - 105 => 600.0, - 106 => 600.0, - 107 => 600.0, - 108 => 600.0, - 109 => 600.0, - 110 => 600.0, - 111 => 600.0, - 112 => 600.0, - 113 => 600.0, - 114 => 600.0, - 115 => 600.0, - 116 => 600.0, - 117 => 600.0, - 118 => 600.0, - 119 => 600.0, - 120 => 600.0, - 121 => 600.0, - 122 => 600.0, - 123 => 600.0, - 124 => 600.0, - 125 => 600.0, - 126 => 600.0, - 161 => 600.0, - 162 => 600.0, - 163 => 600.0, - 'fraction' => 600.0, - 165 => 600.0, - 131 => 600.0, - 167 => 600.0, - 164 => 600.0, - 39 => 600.0, - 147 => 600.0, - 171 => 600.0, - 139 => 600.0, - 155 => 600.0, - 'fi' => 600.0, - 'fl' => 600.0, - 150 => 600.0, - 134 => 600.0, - 135 => 600.0, - 183 => 600.0, - 182 => 600.0, - 149 => 600.0, - 130 => 600.0, - 132 => 600.0, - 148 => 600.0, - 187 => 600.0, - 133 => 600.0, - 137 => 600.0, - 191 => 600.0, - 96 => 600.0, - 180 => 600.0, - 136 => 600.0, - 152 => 600.0, - 175 => 600.0, - 'breve' => 600.0, - 'dotaccent' => 600.0, - 168 => 600.0, - 'ring' => 600.0, - 184 => 600.0, - 'hungarumlaut' => 600.0, - 'ogonek' => 600.0, - 'caron' => 600.0, - 151 => 600.0, - 198 => 600.0, - 170 => 600.0, - 'Lslash' => 600.0, - 216 => 600.0, - 140 => 600.0, - 186 => 600.0, - 230 => 600.0, - 'dotlessi' => 600.0, - 'lslash' => 600.0, - 248 => 600.0, - 156 => 600.0, - 223 => 600.0, - 207 => 600.0, - 233 => 600.0, - 'abreve' => 600.0, - 'uhungarumlaut' => 600.0, - 'ecaron' => 600.0, - 159 => 600.0, - 247 => 600.0, - 221 => 600.0, - 194 => 600.0, - 225 => 600.0, - 219 => 600.0, - 253 => 600.0, - 'scommaaccent' => 600.0, - 234 => 600.0, - 'Uring' => 600.0, - 220 => 600.0, - 'aogonek' => 600.0, - 218 => 600.0, - 'uogonek' => 600.0, - 203 => 600.0, - 'Dcroat' => 600.0, - 'commaaccent' => 600.0, - 169 => 600.0, - 'Emacron' => 600.0, - 'ccaron' => 600.0, - 229 => 600.0, - 'Ncommaaccent' => 600.0, - 'lacute' => 600.0, - 224 => 600.0, - 'Tcommaaccent' => 600.0, - 'Cacute' => 600.0, - 227 => 600.0, - 'Edotaccent' => 600.0, - 154 => 600.0, - 'scedilla' => 600.0, - 237 => 600.0, - 'lozenge' => 600.0, - 'Rcaron' => 600.0, - 'Gcommaaccent' => 600.0, - 251 => 600.0, - 226 => 600.0, - 'Amacron' => 600.0, - 'rcaron' => 600.0, - 231 => 600.0, - 'Zdotaccent' => 600.0, - 222 => 600.0, - 'Omacron' => 600.0, - 'Racute' => 600.0, - 'Sacute' => 600.0, - 'dcaron' => 600.0, - 'Umacron' => 600.0, - 'uring' => 600.0, - 179 => 600.0, - 210 => 600.0, - 192 => 600.0, - 'Abreve' => 600.0, - 215 => 600.0, - 250 => 600.0, - 'Tcaron' => 600.0, - 'partialdiff' => 600.0, - 255 => 600.0, - 'Nacute' => 600.0, - 238 => 600.0, - 202 => 600.0, - 228 => 600.0, - 235 => 600.0, - 'cacute' => 600.0, - 'nacute' => 600.0, - 'umacron' => 600.0, - 'Ncaron' => 600.0, - 205 => 600.0, - 177 => 600.0, - 166 => 600.0, - 174 => 600.0, - 'Gbreve' => 600.0, - 'Idotaccent' => 600.0, - 'summation' => 600.0, - 200 => 600.0, - 'racute' => 600.0, - 'omacron' => 600.0, - 'Zacute' => 600.0, - 142 => 600.0, - 'greaterequal' => 600.0, - 208 => 600.0, - 199 => 600.0, - 'lcommaaccent' => 600.0, - 'tcaron' => 600.0, - 'eogonek' => 600.0, - 'Uogonek' => 600.0, - 193 => 600.0, - 196 => 600.0, - 232 => 600.0, - 'zacute' => 600.0, - 'iogonek' => 600.0, - 211 => 600.0, - 243 => 600.0, - 'amacron' => 600.0, - 'sacute' => 600.0, - 239 => 600.0, - 212 => 600.0, - 217 => 600.0, - 'Delta' => 600.0, - 254 => 600.0, - 178 => 600.0, - 214 => 600.0, - 181 => 600.0, - 236 => 600.0, - 'ohungarumlaut' => 600.0, - 'Eogonek' => 600.0, - 'dcroat' => 600.0, - 190 => 600.0, - 'Scedilla' => 600.0, - 'lcaron' => 600.0, - 'Kcommaaccent' => 600.0, - 'Lacute' => 600.0, - 153 => 600.0, - 'edotaccent' => 600.0, - 204 => 600.0, - 'Imacron' => 600.0, - 'Lcaron' => 600.0, - 189 => 600.0, - 'lessequal' => 600.0, - 244 => 600.0, - 241 => 600.0, - 'Uhungarumlaut' => 600.0, - 201 => 600.0, - 'emacron' => 600.0, - 'gbreve' => 600.0, - 188 => 600.0, - 138 => 600.0, - 'Scommaaccent' => 600.0, - 'Ohungarumlaut' => 600.0, - 176 => 600.0, - 242 => 600.0, - 'Ccaron' => 600.0, - 249 => 600.0, - 'radical' => 600.0, - 'Dcaron' => 600.0, - 'rcommaaccent' => 600.0, - 209 => 600.0, - 245 => 600.0, - 'Rcommaaccent' => 600.0, - 'Lcommaaccent' => 600.0, - 195 => 600.0, - 'Aogonek' => 600.0, - 197 => 600.0, - 213 => 600.0, - 'zdotaccent' => 600.0, - 'Ecaron' => 600.0, - 'Iogonek' => 600.0, - 'kcommaaccent' => 600.0, - 'minus' => 600.0, - 206 => 600.0, - 'ncaron' => 600.0, - 'tcommaaccent' => 600.0, - 172 => 600.0, - 246 => 600.0, - 252 => 600.0, - 'notequal' => 600.0, - 'gcommaaccent' => 600.0, - 240 => 600.0, - 158 => 600.0, - 'ncommaaccent' => 600.0, - 185 => 600.0, - 'imacron' => 600.0, - 128 => 600.0, - ), - 'CIDtoGID_Compressed' => true, - 'CIDtoGID' => 'eJwDAAAAAAE=', - '_version_' => 6, -); \ No newline at end of file diff --git a/storage/fonts/Courier.afm.php b/storage/fonts/Courier.afm.php deleted file mode 100644 index 6a0670ce..00000000 --- a/storage/fonts/Courier.afm.php +++ /dev/null @@ -1,572 +0,0 @@ - - array ( - 32 => 'space', - 160 => 'space', - 33 => 'exclam', - 34 => 'quotedbl', - 35 => 'numbersign', - 36 => 'dollar', - 37 => 'percent', - 38 => 'ampersand', - 146 => 'quoteright', - 40 => 'parenleft', - 41 => 'parenright', - 42 => 'asterisk', - 43 => 'plus', - 44 => 'comma', - 45 => 'hyphen', - 173 => 'hyphen', - 46 => 'period', - 47 => 'slash', - 48 => 'zero', - 49 => 'one', - 50 => 'two', - 51 => 'three', - 52 => 'four', - 53 => 'five', - 54 => 'six', - 55 => 'seven', - 56 => 'eight', - 57 => 'nine', - 58 => 'colon', - 59 => 'semicolon', - 60 => 'less', - 61 => 'equal', - 62 => 'greater', - 63 => 'question', - 64 => 'at', - 65 => 'A', - 66 => 'B', - 67 => 'C', - 68 => 'D', - 69 => 'E', - 70 => 'F', - 71 => 'G', - 72 => 'H', - 73 => 'I', - 74 => 'J', - 75 => 'K', - 76 => 'L', - 77 => 'M', - 78 => 'N', - 79 => 'O', - 80 => 'P', - 81 => 'Q', - 82 => 'R', - 83 => 'S', - 84 => 'T', - 85 => 'U', - 86 => 'V', - 87 => 'W', - 88 => 'X', - 89 => 'Y', - 90 => 'Z', - 91 => 'bracketleft', - 92 => 'backslash', - 93 => 'bracketright', - 94 => 'asciicircum', - 95 => 'underscore', - 145 => 'quoteleft', - 97 => 'a', - 98 => 'b', - 99 => 'c', - 100 => 'd', - 101 => 'e', - 102 => 'f', - 103 => 'g', - 104 => 'h', - 105 => 'i', - 106 => 'j', - 107 => 'k', - 108 => 'l', - 109 => 'm', - 110 => 'n', - 111 => 'o', - 112 => 'p', - 113 => 'q', - 114 => 'r', - 115 => 's', - 116 => 't', - 117 => 'u', - 118 => 'v', - 119 => 'w', - 120 => 'x', - 121 => 'y', - 122 => 'z', - 123 => 'braceleft', - 124 => 'bar', - 125 => 'braceright', - 126 => 'asciitilde', - 161 => 'exclamdown', - 162 => 'cent', - 163 => 'sterling', - 165 => 'yen', - 131 => 'florin', - 167 => 'section', - 164 => 'currency', - 39 => 'quotesingle', - 147 => 'quotedblleft', - 171 => 'guillemotleft', - 139 => 'guilsinglleft', - 155 => 'guilsinglright', - 150 => 'endash', - 134 => 'dagger', - 135 => 'daggerdbl', - 183 => 'periodcentered', - 182 => 'paragraph', - 149 => 'bullet', - 130 => 'quotesinglbase', - 132 => 'quotedblbase', - 148 => 'quotedblright', - 187 => 'guillemotright', - 133 => 'ellipsis', - 137 => 'perthousand', - 191 => 'questiondown', - 96 => 'grave', - 180 => 'acute', - 136 => 'circumflex', - 152 => 'tilde', - 175 => 'macron', - 168 => 'dieresis', - 184 => 'cedilla', - 151 => 'emdash', - 198 => 'AE', - 170 => 'ordfeminine', - 216 => 'Oslash', - 140 => 'OE', - 186 => 'ordmasculine', - 230 => 'ae', - 248 => 'oslash', - 156 => 'oe', - 223 => 'germandbls', - 207 => 'Idieresis', - 233 => 'eacute', - 159 => 'Ydieresis', - 247 => 'divide', - 221 => 'Yacute', - 194 => 'Acircumflex', - 225 => 'aacute', - 219 => 'Ucircumflex', - 253 => 'yacute', - 234 => 'ecircumflex', - 220 => 'Udieresis', - 218 => 'Uacute', - 203 => 'Edieresis', - 169 => 'copyright', - 229 => 'aring', - 224 => 'agrave', - 227 => 'atilde', - 154 => 'scaron', - 237 => 'iacute', - 251 => 'ucircumflex', - 226 => 'acircumflex', - 231 => 'ccedilla', - 222 => 'Thorn', - 179 => 'threesuperior', - 210 => 'Ograve', - 192 => 'Agrave', - 215 => 'multiply', - 250 => 'uacute', - 255 => 'ydieresis', - 238 => 'icircumflex', - 202 => 'Ecircumflex', - 228 => 'adieresis', - 235 => 'edieresis', - 205 => 'Iacute', - 177 => 'plusminus', - 166 => 'brokenbar', - 174 => 'registered', - 200 => 'Egrave', - 142 => 'Zcaron', - 208 => 'Eth', - 199 => 'Ccedilla', - 193 => 'Aacute', - 196 => 'Adieresis', - 232 => 'egrave', - 211 => 'Oacute', - 243 => 'oacute', - 239 => 'idieresis', - 212 => 'Ocircumflex', - 217 => 'Ugrave', - 254 => 'thorn', - 178 => 'twosuperior', - 214 => 'Odieresis', - 181 => 'mu', - 236 => 'igrave', - 190 => 'threequarters', - 153 => 'trademark', - 204 => 'Igrave', - 189 => 'onehalf', - 244 => 'ocircumflex', - 241 => 'ntilde', - 201 => 'Eacute', - 188 => 'onequarter', - 138 => 'Scaron', - 176 => 'degree', - 242 => 'ograve', - 249 => 'ugrave', - 209 => 'Ntilde', - 245 => 'otilde', - 195 => 'Atilde', - 197 => 'Aring', - 213 => 'Otilde', - 206 => 'Icircumflex', - 172 => 'logicalnot', - 246 => 'odieresis', - 252 => 'udieresis', - 240 => 'eth', - 158 => 'zcaron', - 185 => 'onesuperior', - 128 => 'Euro', - ), - 'isUnicode' => false, - 'FontName' => 'Courier', - 'FullName' => 'Courier', - 'FamilyName' => 'Courier', - 'Weight' => 'Medium', - 'ItalicAngle' => '0', - 'IsFixedPitch' => 'true', - 'CharacterSet' => 'ExtendedRoman', - 'FontBBox' => - array ( - 0 => '-23', - 1 => '-250', - 2 => '715', - 3 => '805', - ), - 'UnderlinePosition' => '-100', - 'UnderlineThickness' => '50', - 'Version' => '003.000', - 'EncodingScheme' => 'WinAnsiEncoding', - 'CapHeight' => '562', - 'XHeight' => '426', - 'Ascender' => '629', - 'Descender' => '-157', - 'StdHW' => '51', - 'StdVW' => '51', - 'StartCharMetrics' => '317', - 'C' => - array ( - 32 => 600.0, - 160 => 600.0, - 33 => 600.0, - 34 => 600.0, - 35 => 600.0, - 36 => 600.0, - 37 => 600.0, - 38 => 600.0, - 146 => 600.0, - 40 => 600.0, - 41 => 600.0, - 42 => 600.0, - 43 => 600.0, - 44 => 600.0, - 45 => 600.0, - 173 => 600.0, - 46 => 600.0, - 47 => 600.0, - 48 => 600.0, - 49 => 600.0, - 50 => 600.0, - 51 => 600.0, - 52 => 600.0, - 53 => 600.0, - 54 => 600.0, - 55 => 600.0, - 56 => 600.0, - 57 => 600.0, - 58 => 600.0, - 59 => 600.0, - 60 => 600.0, - 61 => 600.0, - 62 => 600.0, - 63 => 600.0, - 64 => 600.0, - 65 => 600.0, - 66 => 600.0, - 67 => 600.0, - 68 => 600.0, - 69 => 600.0, - 70 => 600.0, - 71 => 600.0, - 72 => 600.0, - 73 => 600.0, - 74 => 600.0, - 75 => 600.0, - 76 => 600.0, - 77 => 600.0, - 78 => 600.0, - 79 => 600.0, - 80 => 600.0, - 81 => 600.0, - 82 => 600.0, - 83 => 600.0, - 84 => 600.0, - 85 => 600.0, - 86 => 600.0, - 87 => 600.0, - 88 => 600.0, - 89 => 600.0, - 90 => 600.0, - 91 => 600.0, - 92 => 600.0, - 93 => 600.0, - 94 => 600.0, - 95 => 600.0, - 145 => 600.0, - 97 => 600.0, - 98 => 600.0, - 99 => 600.0, - 100 => 600.0, - 101 => 600.0, - 102 => 600.0, - 103 => 600.0, - 104 => 600.0, - 105 => 600.0, - 106 => 600.0, - 107 => 600.0, - 108 => 600.0, - 109 => 600.0, - 110 => 600.0, - 111 => 600.0, - 112 => 600.0, - 113 => 600.0, - 114 => 600.0, - 115 => 600.0, - 116 => 600.0, - 117 => 600.0, - 118 => 600.0, - 119 => 600.0, - 120 => 600.0, - 121 => 600.0, - 122 => 600.0, - 123 => 600.0, - 124 => 600.0, - 125 => 600.0, - 126 => 600.0, - 161 => 600.0, - 162 => 600.0, - 163 => 600.0, - 'fraction' => 600.0, - 165 => 600.0, - 131 => 600.0, - 167 => 600.0, - 164 => 600.0, - 39 => 600.0, - 147 => 600.0, - 171 => 600.0, - 139 => 600.0, - 155 => 600.0, - 'fi' => 600.0, - 'fl' => 600.0, - 150 => 600.0, - 134 => 600.0, - 135 => 600.0, - 183 => 600.0, - 182 => 600.0, - 149 => 600.0, - 130 => 600.0, - 132 => 600.0, - 148 => 600.0, - 187 => 600.0, - 133 => 600.0, - 137 => 600.0, - 191 => 600.0, - 96 => 600.0, - 180 => 600.0, - 136 => 600.0, - 152 => 600.0, - 175 => 600.0, - 'breve' => 600.0, - 'dotaccent' => 600.0, - 168 => 600.0, - 'ring' => 600.0, - 184 => 600.0, - 'hungarumlaut' => 600.0, - 'ogonek' => 600.0, - 'caron' => 600.0, - 151 => 600.0, - 198 => 600.0, - 170 => 600.0, - 'Lslash' => 600.0, - 216 => 600.0, - 140 => 600.0, - 186 => 600.0, - 230 => 600.0, - 'dotlessi' => 600.0, - 'lslash' => 600.0, - 248 => 600.0, - 156 => 600.0, - 223 => 600.0, - 207 => 600.0, - 233 => 600.0, - 'abreve' => 600.0, - 'uhungarumlaut' => 600.0, - 'ecaron' => 600.0, - 159 => 600.0, - 247 => 600.0, - 221 => 600.0, - 194 => 600.0, - 225 => 600.0, - 219 => 600.0, - 253 => 600.0, - 'scommaaccent' => 600.0, - 234 => 600.0, - 'Uring' => 600.0, - 220 => 600.0, - 'aogonek' => 600.0, - 218 => 600.0, - 'uogonek' => 600.0, - 203 => 600.0, - 'Dcroat' => 600.0, - 'commaaccent' => 600.0, - 169 => 600.0, - 'Emacron' => 600.0, - 'ccaron' => 600.0, - 229 => 600.0, - 'Ncommaaccent' => 600.0, - 'lacute' => 600.0, - 224 => 600.0, - 'Tcommaaccent' => 600.0, - 'Cacute' => 600.0, - 227 => 600.0, - 'Edotaccent' => 600.0, - 154 => 600.0, - 'scedilla' => 600.0, - 237 => 600.0, - 'lozenge' => 600.0, - 'Rcaron' => 600.0, - 'Gcommaaccent' => 600.0, - 251 => 600.0, - 226 => 600.0, - 'Amacron' => 600.0, - 'rcaron' => 600.0, - 231 => 600.0, - 'Zdotaccent' => 600.0, - 222 => 600.0, - 'Omacron' => 600.0, - 'Racute' => 600.0, - 'Sacute' => 600.0, - 'dcaron' => 600.0, - 'Umacron' => 600.0, - 'uring' => 600.0, - 179 => 600.0, - 210 => 600.0, - 192 => 600.0, - 'Abreve' => 600.0, - 215 => 600.0, - 250 => 600.0, - 'Tcaron' => 600.0, - 'partialdiff' => 600.0, - 255 => 600.0, - 'Nacute' => 600.0, - 238 => 600.0, - 202 => 600.0, - 228 => 600.0, - 235 => 600.0, - 'cacute' => 600.0, - 'nacute' => 600.0, - 'umacron' => 600.0, - 'Ncaron' => 600.0, - 205 => 600.0, - 177 => 600.0, - 166 => 600.0, - 174 => 600.0, - 'Gbreve' => 600.0, - 'Idotaccent' => 600.0, - 'summation' => 600.0, - 200 => 600.0, - 'racute' => 600.0, - 'omacron' => 600.0, - 'Zacute' => 600.0, - 142 => 600.0, - 'greaterequal' => 600.0, - 208 => 600.0, - 199 => 600.0, - 'lcommaaccent' => 600.0, - 'tcaron' => 600.0, - 'eogonek' => 600.0, - 'Uogonek' => 600.0, - 193 => 600.0, - 196 => 600.0, - 232 => 600.0, - 'zacute' => 600.0, - 'iogonek' => 600.0, - 211 => 600.0, - 243 => 600.0, - 'amacron' => 600.0, - 'sacute' => 600.0, - 239 => 600.0, - 212 => 600.0, - 217 => 600.0, - 'Delta' => 600.0, - 254 => 600.0, - 178 => 600.0, - 214 => 600.0, - 181 => 600.0, - 236 => 600.0, - 'ohungarumlaut' => 600.0, - 'Eogonek' => 600.0, - 'dcroat' => 600.0, - 190 => 600.0, - 'Scedilla' => 600.0, - 'lcaron' => 600.0, - 'Kcommaaccent' => 600.0, - 'Lacute' => 600.0, - 153 => 600.0, - 'edotaccent' => 600.0, - 204 => 600.0, - 'Imacron' => 600.0, - 'Lcaron' => 600.0, - 189 => 600.0, - 'lessequal' => 600.0, - 244 => 600.0, - 241 => 600.0, - 'Uhungarumlaut' => 600.0, - 201 => 600.0, - 'emacron' => 600.0, - 'gbreve' => 600.0, - 188 => 600.0, - 138 => 600.0, - 'Scommaaccent' => 600.0, - 'Ohungarumlaut' => 600.0, - 176 => 600.0, - 242 => 600.0, - 'Ccaron' => 600.0, - 249 => 600.0, - 'radical' => 600.0, - 'Dcaron' => 600.0, - 'rcommaaccent' => 600.0, - 209 => 600.0, - 245 => 600.0, - 'Rcommaaccent' => 600.0, - 'Lcommaaccent' => 600.0, - 195 => 600.0, - 'Aogonek' => 600.0, - 197 => 600.0, - 213 => 600.0, - 'zdotaccent' => 600.0, - 'Ecaron' => 600.0, - 'Iogonek' => 600.0, - 'kcommaaccent' => 600.0, - 'minus' => 600.0, - 206 => 600.0, - 'ncaron' => 600.0, - 'tcommaaccent' => 600.0, - 172 => 600.0, - 246 => 600.0, - 252 => 600.0, - 'notequal' => 600.0, - 'gcommaaccent' => 600.0, - 240 => 600.0, - 158 => 600.0, - 'ncommaaccent' => 600.0, - 185 => 600.0, - 'imacron' => 600.0, - 128 => 600.0, - ), - 'CIDtoGID_Compressed' => true, - 'CIDtoGID' => 'eJwDAAAAAAE=', - '_version_' => 6, -); \ No newline at end of file diff --git a/storage/fonts/Helvetica-Oblique.afm.json b/storage/fonts/Helvetica-Oblique.afm.json deleted file mode 100644 index 47838288..00000000 --- a/storage/fonts/Helvetica-Oblique.afm.json +++ /dev/null @@ -1,569 +0,0 @@ -{ - "codeToName": { - "32": "space", - "160": "space", - "33": "exclam", - "34": "quotedbl", - "35": "numbersign", - "36": "dollar", - "37": "percent", - "38": "ampersand", - "146": "quoteright", - "40": "parenleft", - "41": "parenright", - "42": "asterisk", - "43": "plus", - "44": "comma", - "45": "hyphen", - "173": "hyphen", - "46": "period", - "47": "slash", - "48": "zero", - "49": "one", - "50": "two", - "51": "three", - "52": "four", - "53": "five", - "54": "six", - "55": "seven", - "56": "eight", - "57": "nine", - "58": "colon", - "59": "semicolon", - "60": "less", - "61": "equal", - "62": "greater", - "63": "question", - "64": "at", - "65": "A", - "66": "B", - "67": "C", - "68": "D", - "69": "E", - "70": "F", - "71": "G", - "72": "H", - "73": "I", - "74": "J", - "75": "K", - "76": "L", - "77": "M", - "78": "N", - "79": "O", - "80": "P", - "81": "Q", - "82": "R", - "83": "S", - "84": "T", - "85": "U", - "86": "V", - "87": "W", - "88": "X", - "89": "Y", - "90": "Z", - "91": "bracketleft", - "92": "backslash", - "93": "bracketright", - "94": "asciicircum", - "95": "underscore", - "145": "quoteleft", - "97": "a", - "98": "b", - "99": "c", - "100": "d", - "101": "e", - "102": "f", - "103": "g", - "104": "h", - "105": "i", - "106": "j", - "107": "k", - "108": "l", - "109": "m", - "110": "n", - "111": "o", - "112": "p", - "113": "q", - "114": "r", - "115": "s", - "116": "t", - "117": "u", - "118": "v", - "119": "w", - "120": "x", - "121": "y", - "122": "z", - "123": "braceleft", - "124": "bar", - "125": "braceright", - "126": "asciitilde", - "161": "exclamdown", - "162": "cent", - "163": "sterling", - "165": "yen", - "131": "florin", - "167": "section", - "164": "currency", - "39": "quotesingle", - "147": "quotedblleft", - "171": "guillemotleft", - "139": "guilsinglleft", - "155": "guilsinglright", - "150": "endash", - "134": "dagger", - "135": "daggerdbl", - "183": "periodcentered", - "182": "paragraph", - "149": "bullet", - "130": "quotesinglbase", - "132": "quotedblbase", - "148": "quotedblright", - "187": "guillemotright", - "133": "ellipsis", - "137": "perthousand", - "191": "questiondown", - "96": "grave", - "180": "acute", - "136": "circumflex", - "152": "tilde", - "175": "macron", - "168": "dieresis", - "184": "cedilla", - "151": "emdash", - "198": "AE", - "170": "ordfeminine", - "216": "Oslash", - "140": "OE", - "186": "ordmasculine", - "230": "ae", - "248": "oslash", - "156": "oe", - "223": "germandbls", - "207": "Idieresis", - "233": "eacute", - "159": "Ydieresis", - "247": "divide", - "221": "Yacute", - "194": "Acircumflex", - "225": "aacute", - "219": "Ucircumflex", - "253": "yacute", - "234": "ecircumflex", - "220": "Udieresis", - "218": "Uacute", - "203": "Edieresis", - "169": "copyright", - "229": "aring", - "224": "agrave", - "227": "atilde", - "154": "scaron", - "237": "iacute", - "251": "ucircumflex", - "226": "acircumflex", - "231": "ccedilla", - "222": "Thorn", - "179": "threesuperior", - "210": "Ograve", - "192": "Agrave", - "215": "multiply", - "250": "uacute", - "255": "ydieresis", - "238": "icircumflex", - "202": "Ecircumflex", - "228": "adieresis", - "235": "edieresis", - "205": "Iacute", - "177": "plusminus", - "166": "brokenbar", - "174": "registered", - "200": "Egrave", - "142": "Zcaron", - "208": "Eth", - "199": "Ccedilla", - "193": "Aacute", - "196": "Adieresis", - "232": "egrave", - "211": "Oacute", - "243": "oacute", - "239": "idieresis", - "212": "Ocircumflex", - "217": "Ugrave", - "254": "thorn", - "178": "twosuperior", - "214": "Odieresis", - "181": "mu", - "236": "igrave", - "190": "threequarters", - "153": "trademark", - "204": "Igrave", - "189": "onehalf", - "244": "ocircumflex", - "241": "ntilde", - "201": "Eacute", - "188": "onequarter", - "138": "Scaron", - "176": "degree", - "242": "ograve", - "249": "ugrave", - "209": "Ntilde", - "245": "otilde", - "195": "Atilde", - "197": "Aring", - "213": "Otilde", - "206": "Icircumflex", - "172": "logicalnot", - "246": "odieresis", - "252": "udieresis", - "240": "eth", - "158": "zcaron", - "185": "onesuperior", - "128": "Euro" - }, - "isUnicode": false, - "FontName": "Helvetica-Oblique", - "FullName": "Helvetica Oblique", - "FamilyName": "Helvetica", - "Weight": "Medium", - "ItalicAngle": "-12", - "IsFixedPitch": "false", - "CharacterSet": "ExtendedRoman", - "FontBBox": [ - "-170", - "-225", - "1116", - "931" - ], - "UnderlinePosition": "-100", - "UnderlineThickness": "50", - "Version": "002.000", - "EncodingScheme": "WinAnsiEncoding", - "CapHeight": "718", - "XHeight": "523", - "Ascender": "718", - "Descender": "-207", - "StdHW": "76", - "StdVW": "88", - "StartCharMetrics": "317", - "C": { - "32": 278, - "160": 278, - "33": 278, - "34": 355, - "35": 556, - "36": 556, - "37": 889, - "38": 667, - "146": 222, - "40": 333, - "41": 333, - "42": 389, - "43": 584, - "44": 278, - "45": 333, - "173": 333, - "46": 278, - "47": 278, - "48": 556, - "49": 556, - "50": 556, - "51": 556, - "52": 556, - "53": 556, - "54": 556, - "55": 556, - "56": 556, - "57": 556, - "58": 278, - "59": 278, - "60": 584, - "61": 584, - "62": 584, - "63": 556, - "64": 1015, - "65": 667, - "66": 667, - "67": 722, - "68": 722, - "69": 667, - "70": 611, - "71": 778, - "72": 722, - "73": 278, - "74": 500, - "75": 667, - "76": 556, - "77": 833, - "78": 722, - "79": 778, - "80": 667, - "81": 778, - "82": 722, - "83": 667, - "84": 611, - "85": 722, - "86": 667, - "87": 944, - "88": 667, - "89": 667, - "90": 611, - "91": 278, - "92": 278, - "93": 278, - "94": 469, - "95": 556, - "145": 222, - "97": 556, - "98": 556, - "99": 500, - "100": 556, - "101": 556, - "102": 278, - "103": 556, - "104": 556, - "105": 222, - "106": 222, - "107": 500, - "108": 222, - "109": 833, - "110": 556, - "111": 556, - "112": 556, - "113": 556, - "114": 333, - "115": 500, - "116": 278, - "117": 556, - "118": 500, - "119": 722, - "120": 500, - "121": 500, - "122": 500, - "123": 334, - "124": 260, - "125": 334, - "126": 584, - "161": 333, - "162": 556, - "163": 556, - "fraction": 167, - "165": 556, - "131": 556, - "167": 556, - "164": 556, - "39": 191, - "147": 333, - "171": 556, - "139": 333, - "155": 333, - "fi": 500, - "fl": 500, - "150": 556, - "134": 556, - "135": 556, - "183": 278, - "182": 537, - "149": 350, - "130": 222, - "132": 333, - "148": 333, - "187": 556, - "133": 1000, - "137": 1000, - "191": 611, - "96": 333, - "180": 333, - "136": 333, - "152": 333, - "175": 333, - "breve": 333, - "dotaccent": 333, - "168": 333, - "ring": 333, - "184": 333, - "hungarumlaut": 333, - "ogonek": 333, - "caron": 333, - "151": 1000, - "198": 1000, - "170": 370, - "Lslash": 556, - "216": 778, - "140": 1000, - "186": 365, - "230": 889, - "dotlessi": 278, - "lslash": 222, - "248": 611, - "156": 944, - "223": 611, - "207": 278, - "233": 556, - "abreve": 556, - "uhungarumlaut": 556, - "ecaron": 556, - "159": 667, - "247": 584, - "221": 667, - "194": 667, - "225": 556, - "219": 722, - "253": 500, - "scommaaccent": 500, - "234": 556, - "Uring": 722, - "220": 722, - "aogonek": 556, - "218": 722, - "uogonek": 556, - "203": 667, - "Dcroat": 722, - "commaaccent": 250, - "169": 737, - "Emacron": 667, - "ccaron": 500, - "229": 556, - "Ncommaaccent": 722, - "lacute": 222, - "224": 556, - "Tcommaaccent": 611, - "Cacute": 722, - "227": 556, - "Edotaccent": 667, - "154": 500, - "scedilla": 500, - "237": 278, - "lozenge": 471, - "Rcaron": 722, - "Gcommaaccent": 778, - "251": 556, - "226": 556, - "Amacron": 667, - "rcaron": 333, - "231": 500, - "Zdotaccent": 611, - "222": 667, - "Omacron": 778, - "Racute": 722, - "Sacute": 667, - "dcaron": 643, - "Umacron": 722, - "uring": 556, - "179": 333, - "210": 778, - "192": 667, - "Abreve": 667, - "215": 584, - "250": 556, - "Tcaron": 611, - "partialdiff": 476, - "255": 500, - "Nacute": 722, - "238": 278, - "202": 667, - "228": 556, - "235": 556, - "cacute": 500, - "nacute": 556, - "umacron": 556, - "Ncaron": 722, - "205": 278, - "177": 584, - "166": 260, - "174": 737, - "Gbreve": 778, - "Idotaccent": 278, - "summation": 600, - "200": 667, - "racute": 333, - "omacron": 556, - "Zacute": 611, - "142": 611, - "greaterequal": 549, - "208": 722, - "199": 722, - "lcommaaccent": 222, - "tcaron": 317, - "eogonek": 556, - "Uogonek": 722, - "193": 667, - "196": 667, - "232": 556, - "zacute": 500, - "iogonek": 222, - "211": 778, - "243": 556, - "amacron": 556, - "sacute": 500, - "239": 278, - "212": 778, - "217": 722, - "Delta": 612, - "254": 556, - "178": 333, - "214": 778, - "181": 556, - "236": 278, - "ohungarumlaut": 556, - "Eogonek": 667, - "dcroat": 556, - "190": 834, - "Scedilla": 667, - "lcaron": 299, - "Kcommaaccent": 667, - "Lacute": 556, - "153": 1000, - "edotaccent": 556, - "204": 278, - "Imacron": 278, - "Lcaron": 556, - "189": 834, - "lessequal": 549, - "244": 556, - "241": 556, - "Uhungarumlaut": 722, - "201": 667, - "emacron": 556, - "gbreve": 556, - "188": 834, - "138": 667, - "Scommaaccent": 667, - "Ohungarumlaut": 778, - "176": 400, - "242": 556, - "Ccaron": 722, - "249": 556, - "radical": 453, - "Dcaron": 722, - "rcommaaccent": 333, - "209": 722, - "245": 556, - "Rcommaaccent": 722, - "Lcommaaccent": 556, - "195": 667, - "Aogonek": 667, - "197": 667, - "213": 778, - "zdotaccent": 500, - "Ecaron": 667, - "Iogonek": 278, - "kcommaaccent": 500, - "minus": 584, - "206": 278, - "ncaron": 556, - "tcommaaccent": 278, - "172": 584, - "246": 556, - "252": 556, - "notequal": 549, - "gcommaaccent": 556, - "240": 556, - "158": 500, - "ncommaaccent": 556, - "185": 333, - "imacron": 278, - "128": 556 - }, - "CIDtoGID_Compressed": true, - "CIDtoGID": "eJwDAAAAAAE=", - "_version_": 6 -} \ No newline at end of file diff --git a/storage/fonts/Helvetica-Oblique.afm.php b/storage/fonts/Helvetica-Oblique.afm.php old mode 100644 new mode 100755 diff --git a/storage/fonts/Times-Bold.afm.json b/storage/fonts/Times-Bold.afm.json deleted file mode 100644 index 33d0c90f..00000000 --- a/storage/fonts/Times-Bold.afm.json +++ /dev/null @@ -1,569 +0,0 @@ -{ - "codeToName": { - "32": "space", - "160": "space", - "33": "exclam", - "34": "quotedbl", - "35": "numbersign", - "36": "dollar", - "37": "percent", - "38": "ampersand", - "146": "quoteright", - "40": "parenleft", - "41": "parenright", - "42": "asterisk", - "43": "plus", - "44": "comma", - "45": "hyphen", - "173": "hyphen", - "46": "period", - "47": "slash", - "48": "zero", - "49": "one", - "50": "two", - "51": "three", - "52": "four", - "53": "five", - "54": "six", - "55": "seven", - "56": "eight", - "57": "nine", - "58": "colon", - "59": "semicolon", - "60": "less", - "61": "equal", - "62": "greater", - "63": "question", - "64": "at", - "65": "A", - "66": "B", - "67": "C", - "68": "D", - "69": "E", - "70": "F", - "71": "G", - "72": "H", - "73": "I", - "74": "J", - "75": "K", - "76": "L", - "77": "M", - "78": "N", - "79": "O", - "80": "P", - "81": "Q", - "82": "R", - "83": "S", - "84": "T", - "85": "U", - "86": "V", - "87": "W", - "88": "X", - "89": "Y", - "90": "Z", - "91": "bracketleft", - "92": "backslash", - "93": "bracketright", - "94": "asciicircum", - "95": "underscore", - "145": "quoteleft", - "97": "a", - "98": "b", - "99": "c", - "100": "d", - "101": "e", - "102": "f", - "103": "g", - "104": "h", - "105": "i", - "106": "j", - "107": "k", - "108": "l", - "109": "m", - "110": "n", - "111": "o", - "112": "p", - "113": "q", - "114": "r", - "115": "s", - "116": "t", - "117": "u", - "118": "v", - "119": "w", - "120": "x", - "121": "y", - "122": "z", - "123": "braceleft", - "124": "bar", - "125": "braceright", - "126": "asciitilde", - "161": "exclamdown", - "162": "cent", - "163": "sterling", - "165": "yen", - "131": "florin", - "167": "section", - "164": "currency", - "39": "quotesingle", - "147": "quotedblleft", - "171": "guillemotleft", - "139": "guilsinglleft", - "155": "guilsinglright", - "150": "endash", - "134": "dagger", - "135": "daggerdbl", - "183": "periodcentered", - "182": "paragraph", - "149": "bullet", - "130": "quotesinglbase", - "132": "quotedblbase", - "148": "quotedblright", - "187": "guillemotright", - "133": "ellipsis", - "137": "perthousand", - "191": "questiondown", - "96": "grave", - "180": "acute", - "136": "circumflex", - "152": "tilde", - "175": "macron", - "168": "dieresis", - "184": "cedilla", - "151": "emdash", - "198": "AE", - "170": "ordfeminine", - "216": "Oslash", - "140": "OE", - "186": "ordmasculine", - "230": "ae", - "248": "oslash", - "156": "oe", - "223": "germandbls", - "207": "Idieresis", - "233": "eacute", - "159": "Ydieresis", - "247": "divide", - "221": "Yacute", - "194": "Acircumflex", - "225": "aacute", - "219": "Ucircumflex", - "253": "yacute", - "234": "ecircumflex", - "220": "Udieresis", - "218": "Uacute", - "203": "Edieresis", - "169": "copyright", - "229": "aring", - "224": "agrave", - "227": "atilde", - "154": "scaron", - "237": "iacute", - "251": "ucircumflex", - "226": "acircumflex", - "231": "ccedilla", - "222": "Thorn", - "179": "threesuperior", - "210": "Ograve", - "192": "Agrave", - "215": "multiply", - "250": "uacute", - "255": "ydieresis", - "238": "icircumflex", - "202": "Ecircumflex", - "228": "adieresis", - "235": "edieresis", - "205": "Iacute", - "177": "plusminus", - "166": "brokenbar", - "174": "registered", - "200": "Egrave", - "142": "Zcaron", - "208": "Eth", - "199": "Ccedilla", - "193": "Aacute", - "196": "Adieresis", - "232": "egrave", - "211": "Oacute", - "243": "oacute", - "239": "idieresis", - "212": "Ocircumflex", - "217": "Ugrave", - "254": "thorn", - "178": "twosuperior", - "214": "Odieresis", - "181": "mu", - "236": "igrave", - "190": "threequarters", - "153": "trademark", - "204": "Igrave", - "189": "onehalf", - "244": "ocircumflex", - "241": "ntilde", - "201": "Eacute", - "188": "onequarter", - "138": "Scaron", - "176": "degree", - "242": "ograve", - "249": "ugrave", - "209": "Ntilde", - "245": "otilde", - "195": "Atilde", - "197": "Aring", - "213": "Otilde", - "206": "Icircumflex", - "172": "logicalnot", - "246": "odieresis", - "252": "udieresis", - "240": "eth", - "158": "zcaron", - "185": "onesuperior", - "128": "Euro" - }, - "isUnicode": false, - "FontName": "Times-Bold", - "FullName": "Times Bold", - "FamilyName": "Times", - "Weight": "Bold", - "ItalicAngle": "0", - "IsFixedPitch": "false", - "CharacterSet": "ExtendedRoman", - "FontBBox": [ - "-168", - "-218", - "1000", - "935" - ], - "UnderlinePosition": "-100", - "UnderlineThickness": "50", - "Version": "002.000", - "EncodingScheme": "WinAnsiEncoding", - "CapHeight": "676", - "XHeight": "461", - "Ascender": "683", - "Descender": "-217", - "StdHW": "44", - "StdVW": "139", - "StartCharMetrics": "317", - "C": { - "32": 250, - "160": 250, - "33": 333, - "34": 555, - "35": 500, - "36": 500, - "37": 1000, - "38": 833, - "146": 333, - "40": 333, - "41": 333, - "42": 500, - "43": 570, - "44": 250, - "45": 333, - "173": 333, - "46": 250, - "47": 278, - "48": 500, - "49": 500, - "50": 500, - "51": 500, - "52": 500, - "53": 500, - "54": 500, - "55": 500, - "56": 500, - "57": 500, - "58": 333, - "59": 333, - "60": 570, - "61": 570, - "62": 570, - "63": 500, - "64": 930, - "65": 722, - "66": 667, - "67": 722, - "68": 722, - "69": 667, - "70": 611, - "71": 778, - "72": 778, - "73": 389, - "74": 500, - "75": 778, - "76": 667, - "77": 944, - "78": 722, - "79": 778, - "80": 611, - "81": 778, - "82": 722, - "83": 556, - "84": 667, - "85": 722, - "86": 722, - "87": 1000, - "88": 722, - "89": 722, - "90": 667, - "91": 333, - "92": 278, - "93": 333, - "94": 581, - "95": 500, - "145": 333, - "97": 500, - "98": 556, - "99": 444, - "100": 556, - "101": 444, - "102": 333, - "103": 500, - "104": 556, - "105": 278, - "106": 333, - "107": 556, - "108": 278, - "109": 833, - "110": 556, - "111": 500, - "112": 556, - "113": 556, - "114": 444, - "115": 389, - "116": 333, - "117": 556, - "118": 500, - "119": 722, - "120": 500, - "121": 500, - "122": 444, - "123": 394, - "124": 220, - "125": 394, - "126": 520, - "161": 333, - "162": 500, - "163": 500, - "fraction": 167, - "165": 500, - "131": 500, - "167": 500, - "164": 500, - "39": 278, - "147": 500, - "171": 500, - "139": 333, - "155": 333, - "fi": 556, - "fl": 556, - "150": 500, - "134": 500, - "135": 500, - "183": 250, - "182": 540, - "149": 350, - "130": 333, - "132": 500, - "148": 500, - "187": 500, - "133": 1000, - "137": 1000, - "191": 500, - "96": 333, - "180": 333, - "136": 333, - "152": 333, - "175": 333, - "breve": 333, - "dotaccent": 333, - "168": 333, - "ring": 333, - "184": 333, - "hungarumlaut": 333, - "ogonek": 333, - "caron": 333, - "151": 1000, - "198": 1000, - "170": 300, - "Lslash": 667, - "216": 778, - "140": 1000, - "186": 330, - "230": 722, - "dotlessi": 278, - "lslash": 278, - "248": 500, - "156": 722, - "223": 556, - "207": 389, - "233": 444, - "abreve": 500, - "uhungarumlaut": 556, - "ecaron": 444, - "159": 722, - "247": 570, - "221": 722, - "194": 722, - "225": 500, - "219": 722, - "253": 500, - "scommaaccent": 389, - "234": 444, - "Uring": 722, - "220": 722, - "aogonek": 500, - "218": 722, - "uogonek": 556, - "203": 667, - "Dcroat": 722, - "commaaccent": 250, - "169": 747, - "Emacron": 667, - "ccaron": 444, - "229": 500, - "Ncommaaccent": 722, - "lacute": 278, - "224": 500, - "Tcommaaccent": 667, - "Cacute": 722, - "227": 500, - "Edotaccent": 667, - "154": 389, - "scedilla": 389, - "237": 278, - "lozenge": 494, - "Rcaron": 722, - "Gcommaaccent": 778, - "251": 556, - "226": 500, - "Amacron": 722, - "rcaron": 444, - "231": 444, - "Zdotaccent": 667, - "222": 611, - "Omacron": 778, - "Racute": 722, - "Sacute": 556, - "dcaron": 672, - "Umacron": 722, - "uring": 556, - "179": 300, - "210": 778, - "192": 722, - "Abreve": 722, - "215": 570, - "250": 556, - "Tcaron": 667, - "partialdiff": 494, - "255": 500, - "Nacute": 722, - "238": 278, - "202": 667, - "228": 500, - "235": 444, - "cacute": 444, - "nacute": 556, - "umacron": 556, - "Ncaron": 722, - "205": 389, - "177": 570, - "166": 220, - "174": 747, - "Gbreve": 778, - "Idotaccent": 389, - "summation": 600, - "200": 667, - "racute": 444, - "omacron": 500, - "Zacute": 667, - "142": 667, - "greaterequal": 549, - "208": 722, - "199": 722, - "lcommaaccent": 278, - "tcaron": 416, - "eogonek": 444, - "Uogonek": 722, - "193": 722, - "196": 722, - "232": 444, - "zacute": 444, - "iogonek": 278, - "211": 778, - "243": 500, - "amacron": 500, - "sacute": 389, - "239": 278, - "212": 778, - "217": 722, - "Delta": 612, - "254": 556, - "178": 300, - "214": 778, - "181": 556, - "236": 278, - "ohungarumlaut": 500, - "Eogonek": 667, - "dcroat": 556, - "190": 750, - "Scedilla": 556, - "lcaron": 394, - "Kcommaaccent": 778, - "Lacute": 667, - "153": 1000, - "edotaccent": 444, - "204": 389, - "Imacron": 389, - "Lcaron": 667, - "189": 750, - "lessequal": 549, - "244": 500, - "241": 556, - "Uhungarumlaut": 722, - "201": 667, - "emacron": 444, - "gbreve": 500, - "188": 750, - "138": 556, - "Scommaaccent": 556, - "Ohungarumlaut": 778, - "176": 400, - "242": 500, - "Ccaron": 722, - "249": 556, - "radical": 549, - "Dcaron": 722, - "rcommaaccent": 444, - "209": 722, - "245": 500, - "Rcommaaccent": 722, - "Lcommaaccent": 667, - "195": 722, - "Aogonek": 722, - "197": 722, - "213": 778, - "zdotaccent": 444, - "Ecaron": 667, - "Iogonek": 389, - "kcommaaccent": 556, - "minus": 570, - "206": 389, - "ncaron": 556, - "tcommaaccent": 333, - "172": 570, - "246": 500, - "252": 556, - "notequal": 549, - "gcommaaccent": 500, - "240": 500, - "158": 444, - "ncommaaccent": 556, - "185": 300, - "imacron": 278, - "128": 500 - }, - "CIDtoGID_Compressed": true, - "CIDtoGID": "eJwDAAAAAAE=", - "_version_": 6 -} \ No newline at end of file diff --git a/storage/fonts/Times-Italic.afm.json b/storage/fonts/Times-Italic.afm.json deleted file mode 100644 index b94fe1f3..00000000 --- a/storage/fonts/Times-Italic.afm.json +++ /dev/null @@ -1,569 +0,0 @@ -{ - "codeToName": { - "32": "space", - "160": "space", - "33": "exclam", - "34": "quotedbl", - "35": "numbersign", - "36": "dollar", - "37": "percent", - "38": "ampersand", - "146": "quoteright", - "40": "parenleft", - "41": "parenright", - "42": "asterisk", - "43": "plus", - "44": "comma", - "45": "hyphen", - "173": "hyphen", - "46": "period", - "47": "slash", - "48": "zero", - "49": "one", - "50": "two", - "51": "three", - "52": "four", - "53": "five", - "54": "six", - "55": "seven", - "56": "eight", - "57": "nine", - "58": "colon", - "59": "semicolon", - "60": "less", - "61": "equal", - "62": "greater", - "63": "question", - "64": "at", - "65": "A", - "66": "B", - "67": "C", - "68": "D", - "69": "E", - "70": "F", - "71": "G", - "72": "H", - "73": "I", - "74": "J", - "75": "K", - "76": "L", - "77": "M", - "78": "N", - "79": "O", - "80": "P", - "81": "Q", - "82": "R", - "83": "S", - "84": "T", - "85": "U", - "86": "V", - "87": "W", - "88": "X", - "89": "Y", - "90": "Z", - "91": "bracketleft", - "92": "backslash", - "93": "bracketright", - "94": "asciicircum", - "95": "underscore", - "145": "quoteleft", - "97": "a", - "98": "b", - "99": "c", - "100": "d", - "101": "e", - "102": "f", - "103": "g", - "104": "h", - "105": "i", - "106": "j", - "107": "k", - "108": "l", - "109": "m", - "110": "n", - "111": "o", - "112": "p", - "113": "q", - "114": "r", - "115": "s", - "116": "t", - "117": "u", - "118": "v", - "119": "w", - "120": "x", - "121": "y", - "122": "z", - "123": "braceleft", - "124": "bar", - "125": "braceright", - "126": "asciitilde", - "161": "exclamdown", - "162": "cent", - "163": "sterling", - "165": "yen", - "131": "florin", - "167": "section", - "164": "currency", - "39": "quotesingle", - "147": "quotedblleft", - "171": "guillemotleft", - "139": "guilsinglleft", - "155": "guilsinglright", - "150": "endash", - "134": "dagger", - "135": "daggerdbl", - "183": "periodcentered", - "182": "paragraph", - "149": "bullet", - "130": "quotesinglbase", - "132": "quotedblbase", - "148": "quotedblright", - "187": "guillemotright", - "133": "ellipsis", - "137": "perthousand", - "191": "questiondown", - "96": "grave", - "180": "acute", - "136": "circumflex", - "152": "tilde", - "175": "macron", - "168": "dieresis", - "184": "cedilla", - "151": "emdash", - "198": "AE", - "170": "ordfeminine", - "216": "Oslash", - "140": "OE", - "186": "ordmasculine", - "230": "ae", - "248": "oslash", - "156": "oe", - "223": "germandbls", - "207": "Idieresis", - "233": "eacute", - "159": "Ydieresis", - "247": "divide", - "221": "Yacute", - "194": "Acircumflex", - "225": "aacute", - "219": "Ucircumflex", - "253": "yacute", - "234": "ecircumflex", - "220": "Udieresis", - "218": "Uacute", - "203": "Edieresis", - "169": "copyright", - "229": "aring", - "224": "agrave", - "227": "atilde", - "154": "scaron", - "237": "iacute", - "251": "ucircumflex", - "226": "acircumflex", - "231": "ccedilla", - "222": "Thorn", - "179": "threesuperior", - "210": "Ograve", - "192": "Agrave", - "215": "multiply", - "250": "uacute", - "255": "ydieresis", - "238": "icircumflex", - "202": "Ecircumflex", - "228": "adieresis", - "235": "edieresis", - "205": "Iacute", - "177": "plusminus", - "166": "brokenbar", - "174": "registered", - "200": "Egrave", - "142": "Zcaron", - "208": "Eth", - "199": "Ccedilla", - "193": "Aacute", - "196": "Adieresis", - "232": "egrave", - "211": "Oacute", - "243": "oacute", - "239": "idieresis", - "212": "Ocircumflex", - "217": "Ugrave", - "254": "thorn", - "178": "twosuperior", - "214": "Odieresis", - "181": "mu", - "236": "igrave", - "190": "threequarters", - "153": "trademark", - "204": "Igrave", - "189": "onehalf", - "244": "ocircumflex", - "241": "ntilde", - "201": "Eacute", - "188": "onequarter", - "138": "Scaron", - "176": "degree", - "242": "ograve", - "249": "ugrave", - "209": "Ntilde", - "245": "otilde", - "195": "Atilde", - "197": "Aring", - "213": "Otilde", - "206": "Icircumflex", - "172": "logicalnot", - "246": "odieresis", - "252": "udieresis", - "240": "eth", - "158": "zcaron", - "185": "onesuperior", - "128": "Euro" - }, - "isUnicode": false, - "FontName": "Times-Italic", - "FullName": "Times Italic", - "FamilyName": "Times", - "Weight": "Medium", - "ItalicAngle": "-15.5", - "IsFixedPitch": "false", - "CharacterSet": "ExtendedRoman", - "FontBBox": [ - "-169", - "-217", - "1010", - "883" - ], - "UnderlinePosition": "-100", - "UnderlineThickness": "50", - "Version": "002.000", - "EncodingScheme": "WinAnsiEncoding", - "CapHeight": "653", - "XHeight": "441", - "Ascender": "683", - "Descender": "-217", - "StdHW": "32", - "StdVW": "76", - "StartCharMetrics": "317", - "C": { - "32": 250, - "160": 250, - "33": 333, - "34": 420, - "35": 500, - "36": 500, - "37": 833, - "38": 778, - "146": 333, - "40": 333, - "41": 333, - "42": 500, - "43": 675, - "44": 250, - "45": 333, - "173": 333, - "46": 250, - "47": 278, - "48": 500, - "49": 500, - "50": 500, - "51": 500, - "52": 500, - "53": 500, - "54": 500, - "55": 500, - "56": 500, - "57": 500, - "58": 333, - "59": 333, - "60": 675, - "61": 675, - "62": 675, - "63": 500, - "64": 920, - "65": 611, - "66": 611, - "67": 667, - "68": 722, - "69": 611, - "70": 611, - "71": 722, - "72": 722, - "73": 333, - "74": 444, - "75": 667, - "76": 556, - "77": 833, - "78": 667, - "79": 722, - "80": 611, - "81": 722, - "82": 611, - "83": 500, - "84": 556, - "85": 722, - "86": 611, - "87": 833, - "88": 611, - "89": 556, - "90": 556, - "91": 389, - "92": 278, - "93": 389, - "94": 422, - "95": 500, - "145": 333, - "97": 500, - "98": 500, - "99": 444, - "100": 500, - "101": 444, - "102": 278, - "103": 500, - "104": 500, - "105": 278, - "106": 278, - "107": 444, - "108": 278, - "109": 722, - "110": 500, - "111": 500, - "112": 500, - "113": 500, - "114": 389, - "115": 389, - "116": 278, - "117": 500, - "118": 444, - "119": 667, - "120": 444, - "121": 444, - "122": 389, - "123": 400, - "124": 275, - "125": 400, - "126": 541, - "161": 389, - "162": 500, - "163": 500, - "fraction": 167, - "165": 500, - "131": 500, - "167": 500, - "164": 500, - "39": 214, - "147": 556, - "171": 500, - "139": 333, - "155": 333, - "fi": 500, - "fl": 500, - "150": 500, - "134": 500, - "135": 500, - "183": 250, - "182": 523, - "149": 350, - "130": 333, - "132": 556, - "148": 556, - "187": 500, - "133": 889, - "137": 1000, - "191": 500, - "96": 333, - "180": 333, - "136": 333, - "152": 333, - "175": 333, - "breve": 333, - "dotaccent": 333, - "168": 333, - "ring": 333, - "184": 333, - "hungarumlaut": 333, - "ogonek": 333, - "caron": 333, - "151": 889, - "198": 889, - "170": 276, - "Lslash": 556, - "216": 722, - "140": 944, - "186": 310, - "230": 667, - "dotlessi": 278, - "lslash": 278, - "248": 500, - "156": 667, - "223": 500, - "207": 333, - "233": 444, - "abreve": 500, - "uhungarumlaut": 500, - "ecaron": 444, - "159": 556, - "247": 675, - "221": 556, - "194": 611, - "225": 500, - "219": 722, - "253": 444, - "scommaaccent": 389, - "234": 444, - "Uring": 722, - "220": 722, - "aogonek": 500, - "218": 722, - "uogonek": 500, - "203": 611, - "Dcroat": 722, - "commaaccent": 250, - "169": 760, - "Emacron": 611, - "ccaron": 444, - "229": 500, - "Ncommaaccent": 667, - "lacute": 278, - "224": 500, - "Tcommaaccent": 556, - "Cacute": 667, - "227": 500, - "Edotaccent": 611, - "154": 389, - "scedilla": 389, - "237": 278, - "lozenge": 471, - "Rcaron": 611, - "Gcommaaccent": 722, - "251": 500, - "226": 500, - "Amacron": 611, - "rcaron": 389, - "231": 444, - "Zdotaccent": 556, - "222": 611, - "Omacron": 722, - "Racute": 611, - "Sacute": 500, - "dcaron": 544, - "Umacron": 722, - "uring": 500, - "179": 300, - "210": 722, - "192": 611, - "Abreve": 611, - "215": 675, - "250": 500, - "Tcaron": 556, - "partialdiff": 476, - "255": 444, - "Nacute": 667, - "238": 278, - "202": 611, - "228": 500, - "235": 444, - "cacute": 444, - "nacute": 500, - "umacron": 500, - "Ncaron": 667, - "205": 333, - "177": 675, - "166": 275, - "174": 760, - "Gbreve": 722, - "Idotaccent": 333, - "summation": 600, - "200": 611, - "racute": 389, - "omacron": 500, - "Zacute": 556, - "142": 556, - "greaterequal": 549, - "208": 722, - "199": 667, - "lcommaaccent": 278, - "tcaron": 300, - "eogonek": 444, - "Uogonek": 722, - "193": 611, - "196": 611, - "232": 444, - "zacute": 389, - "iogonek": 278, - "211": 722, - "243": 500, - "amacron": 500, - "sacute": 389, - "239": 278, - "212": 722, - "217": 722, - "Delta": 612, - "254": 500, - "178": 300, - "214": 722, - "181": 500, - "236": 278, - "ohungarumlaut": 500, - "Eogonek": 611, - "dcroat": 500, - "190": 750, - "Scedilla": 500, - "lcaron": 300, - "Kcommaaccent": 667, - "Lacute": 556, - "153": 980, - "edotaccent": 444, - "204": 333, - "Imacron": 333, - "Lcaron": 611, - "189": 750, - "lessequal": 549, - "244": 500, - "241": 500, - "Uhungarumlaut": 722, - "201": 611, - "emacron": 444, - "gbreve": 500, - "188": 750, - "138": 500, - "Scommaaccent": 500, - "Ohungarumlaut": 722, - "176": 400, - "242": 500, - "Ccaron": 667, - "249": 500, - "radical": 453, - "Dcaron": 722, - "rcommaaccent": 389, - "209": 667, - "245": 500, - "Rcommaaccent": 611, - "Lcommaaccent": 556, - "195": 611, - "Aogonek": 611, - "197": 611, - "213": 722, - "zdotaccent": 389, - "Ecaron": 611, - "Iogonek": 333, - "kcommaaccent": 444, - "minus": 675, - "206": 333, - "ncaron": 500, - "tcommaaccent": 278, - "172": 675, - "246": 500, - "252": 500, - "notequal": 549, - "gcommaaccent": 500, - "240": 500, - "158": 389, - "ncommaaccent": 500, - "185": 300, - "imacron": 278, - "128": 500 - }, - "CIDtoGID_Compressed": true, - "CIDtoGID": "eJwDAAAAAAE=", - "_version_": 6 -} \ No newline at end of file diff --git a/storage/fonts/dompdf_font_family_cache.php b/storage/fonts/dompdf_font_family_cache.php old mode 100644 new mode 100755 index 581d4c08..b8e3fcc6 --- a/storage/fonts/dompdf_font_family_cache.php +++ b/storage/fonts/dompdf_font_family_cache.php @@ -79,10 +79,10 @@ return array ( 'normal' => $rootDir . '/lib/fonts/DejaVuSerif', ), 'roboto' => array( - '300' => $fontDir . '/roboto_300_86a9f54c2ccfbd31b9782b15d2d9345a', - 'normal' => $fontDir . '/roboto_normal_0b05025fa87afc0a2692736d55437e3e', - '500' => $fontDir . '/roboto_500_ea0fdb6a5a091a75340659ff9fb153c5', - 'bold' => $fontDir . '/roboto_bold_99297763247149b794ebaeda781037cd', + '300' => $fontDir . '/roboto_300_4367a01ee3518367111dfcda6c2027e6', + 'normal' => $fontDir . '/roboto_normal_75cc3fda36c0aa28c6afd265b6da53c3', + '500' => $fontDir . '/roboto_500_6661968338896d5d67dd0ed0f94fa51c', + 'bold' => $fontDir . '/roboto_bold_d8a5500bace8c7ad9b0027b9450cfc52', ), ); }; ?> \ No newline at end of file diff --git a/storage/fonts/installed-fonts.json b/storage/fonts/installed-fonts.json old mode 100644 new mode 100755 index 9c5524e9..4f785da3 --- a/storage/fonts/installed-fonts.json +++ b/storage/fonts/installed-fonts.json @@ -1,8 +1,8 @@ { "roboto": { - "300": "\/Users\/kadmin\/Websites\/mivita.care\/storage\/fonts\/roboto_300_ab4f9b52de0081f7a06074da2fb3b569", - "normal": "\/Users\/kadmin\/Websites\/mivita.care\/storage\/fonts\/roboto_normal_db728720271025e5118179e1b242240f", - "500": "\/Users\/kadmin\/Websites\/mivita.care\/storage\/fonts\/roboto_500_67ddb0ca36aac651541deb7fa6dc71ab", - "bold": "roboto_bold_b915e443d033da031927fe8f39b8b856" + "300": "roboto_300_4367a01ee3518367111dfcda6c2027e6", + "normal": "roboto_normal_75cc3fda36c0aa28c6afd265b6da53c3", + "500": "roboto_500_6661968338896d5d67dd0ed0f94fa51c", + "bold": "roboto_bold_d8a5500bace8c7ad9b0027b9450cfc52" } } \ No newline at end of file diff --git a/storage/fonts/roboto/roboto-v20-latin-300.eot b/storage/fonts/roboto/roboto-v20-latin-300.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300.svg b/storage/fonts/roboto/roboto-v20-latin-300.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300.ttf b/storage/fonts/roboto/roboto-v20-latin-300.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300.woff b/storage/fonts/roboto/roboto-v20-latin-300.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300.woff2 b/storage/fonts/roboto/roboto-v20-latin-300.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300italic.eot b/storage/fonts/roboto/roboto-v20-latin-300italic.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300italic.svg b/storage/fonts/roboto/roboto-v20-latin-300italic.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300italic.ttf b/storage/fonts/roboto/roboto-v20-latin-300italic.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300italic.woff b/storage/fonts/roboto/roboto-v20-latin-300italic.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-300italic.woff2 b/storage/fonts/roboto/roboto-v20-latin-300italic.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500.eot b/storage/fonts/roboto/roboto-v20-latin-500.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500.svg b/storage/fonts/roboto/roboto-v20-latin-500.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500.ttf b/storage/fonts/roboto/roboto-v20-latin-500.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500.woff b/storage/fonts/roboto/roboto-v20-latin-500.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500.woff2 b/storage/fonts/roboto/roboto-v20-latin-500.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500italic.eot b/storage/fonts/roboto/roboto-v20-latin-500italic.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500italic.svg b/storage/fonts/roboto/roboto-v20-latin-500italic.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500italic.ttf b/storage/fonts/roboto/roboto-v20-latin-500italic.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500italic.woff b/storage/fonts/roboto/roboto-v20-latin-500italic.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-500italic.woff2 b/storage/fonts/roboto/roboto-v20-latin-500italic.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700.eot b/storage/fonts/roboto/roboto-v20-latin-700.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700.svg b/storage/fonts/roboto/roboto-v20-latin-700.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700.ttf b/storage/fonts/roboto/roboto-v20-latin-700.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700.woff b/storage/fonts/roboto/roboto-v20-latin-700.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700.woff2 b/storage/fonts/roboto/roboto-v20-latin-700.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700italic.eot b/storage/fonts/roboto/roboto-v20-latin-700italic.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700italic.svg b/storage/fonts/roboto/roboto-v20-latin-700italic.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700italic.ttf b/storage/fonts/roboto/roboto-v20-latin-700italic.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700italic.woff b/storage/fonts/roboto/roboto-v20-latin-700italic.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-700italic.woff2 b/storage/fonts/roboto/roboto-v20-latin-700italic.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-900.eot b/storage/fonts/roboto/roboto-v20-latin-900.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-900.svg b/storage/fonts/roboto/roboto-v20-latin-900.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-900.ttf b/storage/fonts/roboto/roboto-v20-latin-900.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-900.woff b/storage/fonts/roboto/roboto-v20-latin-900.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-900.woff2 b/storage/fonts/roboto/roboto-v20-latin-900.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-italic.eot b/storage/fonts/roboto/roboto-v20-latin-italic.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-italic.svg b/storage/fonts/roboto/roboto-v20-latin-italic.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-italic.ttf b/storage/fonts/roboto/roboto-v20-latin-italic.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-italic.woff b/storage/fonts/roboto/roboto-v20-latin-italic.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-italic.woff2 b/storage/fonts/roboto/roboto-v20-latin-italic.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-regular.eot b/storage/fonts/roboto/roboto-v20-latin-regular.eot old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-regular.svg b/storage/fonts/roboto/roboto-v20-latin-regular.svg old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-regular.ttf b/storage/fonts/roboto/roboto-v20-latin-regular.ttf old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-regular.woff b/storage/fonts/roboto/roboto-v20-latin-regular.woff old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto/roboto-v20-latin-regular.woff2 b/storage/fonts/roboto/roboto-v20-latin-regular.woff2 old mode 100644 new mode 100755 diff --git a/storage/fonts/roboto_300_86a9f54c2ccfbd31b9782b15d2d9345a.ttf b/storage/fonts/roboto_300_4367a01ee3518367111dfcda6c2027e6.ttf old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_300_86a9f54c2ccfbd31b9782b15d2d9345a.ttf rename to storage/fonts/roboto_300_4367a01ee3518367111dfcda6c2027e6.ttf diff --git a/storage/fonts/roboto_300_86a9f54c2ccfbd31b9782b15d2d9345a.ufm b/storage/fonts/roboto_300_4367a01ee3518367111dfcda6c2027e6.ufm old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_300_86a9f54c2ccfbd31b9782b15d2d9345a.ufm rename to storage/fonts/roboto_300_4367a01ee3518367111dfcda6c2027e6.ufm diff --git a/storage/fonts/roboto_300_ab4f9b52de0081f7a06074da2fb3b569.ttf b/storage/fonts/roboto_300_ab4f9b52de0081f7a06074da2fb3b569.ttf deleted file mode 100644 index 57a24e82..00000000 Binary files a/storage/fonts/roboto_300_ab4f9b52de0081f7a06074da2fb3b569.ttf and /dev/null differ diff --git a/storage/fonts/roboto_300_ab4f9b52de0081f7a06074da2fb3b569.ufm b/storage/fonts/roboto_300_ab4f9b52de0081f7a06074da2fb3b569.ufm deleted file mode 100644 index 2eb3b277..00000000 --- a/storage/fonts/roboto_300_ab4f9b52de0081f7a06074da2fb3b569.ufm +++ /dev/null @@ -1,248 +0,0 @@ -StartFontMetrics 4.1 -Notice Converted by PHP-font-lib -Comment https://github.com/PhenX/php-font-lib -EncodingScheme FontSpecific -Copyright Copyright 2011 Google Inc. All Rights Reserved. -FontName Roboto Light -FontSubfamily Regular -UniqueID Roboto Light -FullName Roboto Light -Version Version 2.137; 2017 -PostScriptName Roboto-Light -LicenseURL http://www.apache.org/licenses/LICENSE-2.0 -Weight Medium -ItalicAngle 0 -IsFixedPitch false -UnderlineThickness 49 -UnderlinePosition -73 -FontHeightOffset 0 -Ascender 928 -Descender -244 -FontBBox -734 -271 1138 1056 -StartCharMetrics 248 -U 0 ; WX 0 ; N uni0000 ; G 1 -U 13 ; WX 243 ; N uni000d ; G 3 -U 32 ; WX 243 ; N uni0020 ; G 4 -U 33 ; WX 226 ; N uni0021 ; G 5 -U 34 ; WX 287 ; N uni0022 ; G 6 -U 35 ; WX 582 ; N uni0023 ; G 7 -U 36 ; WX 554 ; N uni0024 ; G 8 -U 37 ; WX 739 ; N uni0025 ; G 9 -U 38 ; WX 615 ; N uni0026 ; G 10 -U 39 ; WX 170 ; N uni0027 ; G 11 -U 40 ; WX 319 ; N uni0028 ; G 12 -U 41 ; WX 326 ; N uni0029 ; G 13 -U 42 ; WX 424 ; N uni002a ; G 14 -U 43 ; WX 564 ; N uni002b ; G 15 -U 44 ; WX 191 ; N uni002c ; G 16 -U 45 ; WX 286 ; N uni002d ; G 17 -U 46 ; WX 239 ; N uni002e ; G 18 -U 47 ; WX 397 ; N uni002f ; G 19 -U 48 ; WX 554 ; N uni0030 ; G 20 -U 49 ; WX 554 ; N uni0031 ; G 21 -U 50 ; WX 554 ; N uni0032 ; G 22 -U 51 ; WX 554 ; N uni0033 ; G 23 -U 52 ; WX 554 ; N uni0034 ; G 24 -U 53 ; WX 554 ; N uni0035 ; G 25 -U 54 ; WX 554 ; N uni0036 ; G 26 -U 55 ; WX 554 ; N uni0037 ; G 27 -U 56 ; WX 554 ; N uni0038 ; G 28 -U 57 ; WX 554 ; N uni0039 ; G 29 -U 58 ; WX 210 ; N uni003a ; G 30 -U 59 ; WX 195 ; N uni003b ; G 31 -U 60 ; WX 511 ; N uni003c ; G 32 -U 61 ; WX 553 ; N uni003d ; G 33 -U 62 ; WX 518 ; N uni003e ; G 34 -U 63 ; WX 454 ; N uni003f ; G 35 -U 64 ; WX 913 ; N uni0040 ; G 36 -U 65 ; WX 625 ; N uni0041 ; G 37 -U 66 ; WX 613 ; N uni0042 ; G 38 -U 67 ; WX 649 ; N uni0043 ; G 39 -U 68 ; WX 655 ; N uni0044 ; G 40 -U 69 ; WX 569 ; N uni0045 ; G 41 -U 70 ; WX 563 ; N uni0046 ; G 42 -U 71 ; WX 684 ; N uni0047 ; G 43 -U 72 ; WX 708 ; N uni0048 ; G 44 -U 73 ; WX 266 ; N uni0049 ; G 45 -U 74 ; WX 550 ; N uni004a ; G 46 -U 75 ; WX 631 ; N uni004b ; G 47 -U 76 ; WX 527 ; N uni004c ; G 48 -U 77 ; WX 865 ; N uni004d ; G 49 -U 78 ; WX 710 ; N uni004e ; G 50 -U 79 ; WX 677 ; N uni004f ; G 51 -U 80 ; WX 616 ; N uni0050 ; G 52 -U 81 ; WX 677 ; N uni0051 ; G 53 -U 82 ; WX 635 ; N uni0052 ; G 54 -U 83 ; WX 592 ; N uni0053 ; G 55 -U 84 ; WX 597 ; N uni0054 ; G 56 -U 85 ; WX 657 ; N uni0055 ; G 57 -U 86 ; WX 617 ; N uni0056 ; G 58 -U 87 ; WX 896 ; N uni0057 ; G 59 -U 88 ; WX 612 ; N uni0058 ; G 60 -U 89 ; WX 599 ; N uni0059 ; G 61 -U 90 ; WX 598 ; N uni005a ; G 62 -U 91 ; WX 240 ; N uni005b ; G 63 -U 92 ; WX 394 ; N uni005c ; G 64 -U 93 ; WX 240 ; N uni005d ; G 65 -U 94 ; WX 416 ; N uni005e ; G 66 -U 95 ; WX 432 ; N uni005f ; G 67 -U 96 ; WX 286 ; N uni0060 ; G 68 -U 97 ; WX 536 ; N uni0061 ; G 69 -U 98 ; WX 554 ; N uni0062 ; G 70 -U 99 ; WX 515 ; N uni0063 ; G 71 -U 100 ; WX 556 ; N uni0064 ; G 72 -U 101 ; WX 517 ; N uni0065 ; G 73 -U 102 ; WX 331 ; N uni0066 ; G 74 -U 103 ; WX 555 ; N uni0067 ; G 75 -U 104 ; WX 549 ; N uni0068 ; G 76 -U 105 ; WX 224 ; N uni0069 ; G 77 -U 106 ; WX 228 ; N uni006a ; G 78 -U 107 ; WX 490 ; N uni006b ; G 79 -U 108 ; WX 224 ; N uni006c ; G 80 -U 109 ; WX 886 ; N uni006d ; G 81 -U 110 ; WX 549 ; N uni006e ; G 82 -U 111 ; WX 560 ; N uni006f ; G 83 -U 112 ; WX 554 ; N uni0070 ; G 84 -U 113 ; WX 558 ; N uni0071 ; G 85 -U 114 ; WX 336 ; N uni0072 ; G 86 -U 115 ; WX 506 ; N uni0073 ; G 87 -U 116 ; WX 321 ; N uni0074 ; G 88 -U 117 ; WX 549 ; N uni0075 ; G 89 -U 118 ; WX 481 ; N uni0076 ; G 90 -U 119 ; WX 754 ; N uni0077 ; G 91 -U 120 ; WX 486 ; N uni0078 ; G 92 -U 121 ; WX 475 ; N uni0079 ; G 93 -U 122 ; WX 486 ; N uni007a ; G 94 -U 123 ; WX 330 ; N uni007b ; G 95 -U 124 ; WX 221 ; N uni007c ; G 96 -U 125 ; WX 330 ; N uni007d ; G 97 -U 126 ; WX 685 ; N uni007e ; G 98 -U 160 ; WX 243 ; N uni00a0 ; G 189 -U 161 ; WX 221 ; N uni00a1 ; G 99 -U 162 ; WX 544 ; N uni00a2 ; G 100 -U 163 ; WX 571 ; N uni00a3 ; G 101 -U 164 ; WX 723 ; N uni00a4 ; G 102 -U 165 ; WX 516 ; N uni00a5 ; G 103 -U 166 ; WX 217 ; N uni00a6 ; G 104 -U 167 ; WX 605 ; N uni00a7 ; G 105 -U 168 ; WX 430 ; N uni00a8 ; G 106 -U 169 ; WX 799 ; N uni00a9 ; G 107 -U 170 ; WX 442 ; N uni00aa ; G 108 -U 171 ; WX 456 ; N uni00ab ; G 109 -U 172 ; WX 545 ; N uni00ac ; G 110 -U 173 ; WX 286 ; N uni00ad ; G 190 -U 174 ; WX 802 ; N uni00ae ; G 111 -U 175 ; WX 427 ; N uni00af ; G 112 -U 176 ; WX 378 ; N uni00b0 ; G 113 -U 177 ; WX 530 ; N uni00b1 ; G 114 -U 178 ; WX 361 ; N uni00b2 ; G 115 -U 179 ; WX 361 ; N uni00b3 ; G 116 -U 180 ; WX 281 ; N uni00b4 ; G 117 -U 181 ; WX 557 ; N uni00b5 ; G 118 -U 182 ; WX 475 ; N uni00b6 ; G 119 -U 183 ; WX 246 ; N uni00b7 ; G 120 -U 184 ; WX 243 ; N uni00b8 ; G 121 -U 185 ; WX 361 ; N uni00b9 ; G 122 -U 186 ; WX 450 ; N uni00ba ; G 123 -U 187 ; WX 453 ; N uni00bb ; G 124 -U 188 ; WX 725 ; N uni00bc ; G 125 -U 189 ; WX 756 ; N uni00bd ; G 126 -U 190 ; WX 776 ; N uni00be ; G 127 -U 191 ; WX 459 ; N uni00bf ; G 128 -U 192 ; WX 625 ; N uni00c0 ; G 192 -U 193 ; WX 625 ; N uni00c1 ; G 193 -U 194 ; WX 625 ; N uni00c2 ; G 194 -U 195 ; WX 625 ; N uni00c3 ; G 195 -U 196 ; WX 625 ; N uni00c4 ; G 196 -U 197 ; WX 625 ; N uni00c5 ; G 197 -U 198 ; WX 911 ; N uni00c6 ; G 129 -U 199 ; WX 649 ; N uni00c7 ; G 198 -U 200 ; WX 569 ; N uni00c8 ; G 199 -U 201 ; WX 569 ; N uni00c9 ; G 200 -U 202 ; WX 569 ; N uni00ca ; G 201 -U 203 ; WX 569 ; N uni00cb ; G 202 -U 204 ; WX 266 ; N uni00cc ; G 203 -U 205 ; WX 266 ; N uni00cd ; G 204 -U 206 ; WX 266 ; N uni00ce ; G 205 -U 207 ; WX 266 ; N uni00cf ; G 206 -U 208 ; WX 669 ; N uni00d0 ; G 191 -U 209 ; WX 710 ; N uni00d1 ; G 207 -U 210 ; WX 677 ; N uni00d2 ; G 208 -U 211 ; WX 677 ; N uni00d3 ; G 209 -U 212 ; WX 677 ; N uni00d4 ; G 210 -U 213 ; WX 677 ; N uni00d5 ; G 211 -U 214 ; WX 677 ; N uni00d6 ; G 212 -U 215 ; WX 523 ; N uni00d7 ; G 130 -U 216 ; WX 677 ; N uni00d8 ; G 131 -U 217 ; WX 657 ; N uni00d9 ; G 213 -U 218 ; WX 657 ; N uni00da ; G 214 -U 219 ; WX 657 ; N uni00db ; G 215 -U 220 ; WX 657 ; N uni00dc ; G 216 -U 221 ; WX 599 ; N uni00dd ; G 217 -U 222 ; WX 593 ; N uni00de ; G 132 -U 223 ; WX 586 ; N uni00df ; G 133 -U 224 ; WX 536 ; N uni00e0 ; G 218 -U 225 ; WX 536 ; N uni00e1 ; G 219 -U 226 ; WX 536 ; N uni00e2 ; G 220 -U 227 ; WX 536 ; N uni00e3 ; G 221 -U 228 ; WX 536 ; N uni00e4 ; G 222 -U 229 ; WX 536 ; N uni00e5 ; G 223 -U 230 ; WX 846 ; N uni00e6 ; G 134 -U 231 ; WX 515 ; N uni00e7 ; G 224 -U 232 ; WX 517 ; N uni00e8 ; G 225 -U 233 ; WX 517 ; N uni00e9 ; G 226 -U 234 ; WX 517 ; N uni00ea ; G 227 -U 235 ; WX 517 ; N uni00eb ; G 228 -U 236 ; WX 223 ; N uni00ec ; G 229 -U 237 ; WX 223 ; N uni00ed ; G 230 -U 238 ; WX 223 ; N uni00ee ; G 231 -U 239 ; WX 223 ; N uni00ef ; G 232 -U 240 ; WX 582 ; N uni00f0 ; G 135 -U 241 ; WX 549 ; N uni00f1 ; G 233 -U 242 ; WX 560 ; N uni00f2 ; G 234 -U 243 ; WX 560 ; N uni00f3 ; G 235 -U 244 ; WX 560 ; N uni00f4 ; G 236 -U 245 ; WX 560 ; N uni00f5 ; G 237 -U 246 ; WX 560 ; N uni00f6 ; G 238 -U 247 ; WX 568 ; N uni00f7 ; G 136 -U 248 ; WX 557 ; N uni00f8 ; G 137 -U 249 ; WX 549 ; N uni00f9 ; G 239 -U 250 ; WX 549 ; N uni00fa ; G 240 -U 251 ; WX 549 ; N uni00fb ; G 241 -U 252 ; WX 549 ; N uni00fc ; G 242 -U 253 ; WX 475 ; N uni00fd ; G 243 -U 254 ; WX 562 ; N uni00fe ; G 138 -U 255 ; WX 475 ; N uni00ff ; G 244 -U 305 ; WX 223 ; N uni0131 ; G 139 -U 338 ; WX 934 ; N uni0152 ; G 140 -U 339 ; WX 924 ; N uni0153 ; G 141 -U 700 ; WX 178 ; N uni02bc ; G 247 -U 710 ; WX 430 ; N uni02c6 ; G 142 -U 730 ; WX 310 ; N uni02da ; G 143 -U 732 ; WX 435 ; N uni02dc ; G 144 -U 8194 ; WX 510 ; N uni2002 ; G 145 -U 8201 ; WX 204 ; N uni2009 ; G 146 -U 8203 ; WX 0 ; N uni200b ; G 148 -U 8211 ; WX 651 ; N uni2013 ; G 149 -U 8212 ; WX 771 ; N uni2014 ; G 150 -U 8216 ; WX 178 ; N uni2018 ; G 151 -U 8217 ; WX 178 ; N uni2019 ; G 152 -U 8218 ; WX 172 ; N uni201a ; G 153 -U 8220 ; WX 299 ; N uni201c ; G 154 -U 8221 ; WX 301 ; N uni201d ; G 155 -U 8222 ; WX 290 ; N uni201e ; G 156 -U 8226 ; WX 323 ; N uni2022 ; G 157 -U 8230 ; WX 641 ; N uni2026 ; G 158 -U 8242 ; WX 170 ; N uni2032 ; G 245 -U 8243 ; WX 287 ; N uni2033 ; G 246 -U 8249 ; WX 297 ; N uni2039 ; G 159 -U 8250 ; WX 297 ; N uni203a ; G 160 -U 8260 ; WX 448 ; N uni2044 ; G 161 -U 8308 ; WX 361 ; N uni2074 ; G 162 -U 8364 ; WX 554 ; N uni20ac ; G 163 -U 8482 ; WX 617 ; N uni2122 ; G 164 -U 8722 ; WX 570 ; N uni2212 ; G 165 -U 65279 ; WX 0 ; N unifeff ; G 170 -U 65533 ; WX 1026 ; N unifffd ; G 171 -EndCharMetrics -EndFontMetrics diff --git a/storage/fonts/roboto_500_67ddb0ca36aac651541deb7fa6dc71ab.ttf b/storage/fonts/roboto_500_6661968338896d5d67dd0ed0f94fa51c.ttf old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_500_67ddb0ca36aac651541deb7fa6dc71ab.ttf rename to storage/fonts/roboto_500_6661968338896d5d67dd0ed0f94fa51c.ttf diff --git a/storage/fonts/roboto_500_67ddb0ca36aac651541deb7fa6dc71ab.ufm b/storage/fonts/roboto_500_6661968338896d5d67dd0ed0f94fa51c.ufm old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_500_67ddb0ca36aac651541deb7fa6dc71ab.ufm rename to storage/fonts/roboto_500_6661968338896d5d67dd0ed0f94fa51c.ufm diff --git a/storage/fonts/roboto_500_67ddb0ca36aac651541deb7fa6dc71ab.ufm.json b/storage/fonts/roboto_500_67ddb0ca36aac651541deb7fa6dc71ab.ufm.json deleted file mode 100644 index 5e24037a..00000000 --- a/storage/fonts/roboto_500_67ddb0ca36aac651541deb7fa6dc71ab.ufm.json +++ /dev/null @@ -1,478 +0,0 @@ -{ - "codeToName": { - "0": "uni0000", - "13": "uni000d", - "32": "uni0020", - "33": "uni0021", - "34": "uni0022", - "35": "uni0023", - "36": "uni0024", - "37": "uni0025", - "38": "uni0026", - "39": "uni0027", - "40": "uni0028", - "41": "uni0029", - "42": "uni002a", - "43": "uni002b", - "44": "uni002c", - "45": "uni002d", - "46": "uni002e", - "47": "uni002f", - "48": "uni0030", - "49": "uni0031", - "50": "uni0032", - "51": "uni0033", - "52": "uni0034", - "53": "uni0035", - "54": "uni0036", - "55": "uni0037", - "56": "uni0038", - "57": "uni0039", - "58": "uni003a", - "59": "uni003b", - "60": "uni003c", - "61": "uni003d", - "62": "uni003e", - "63": "uni003f", - "64": "uni0040", - "65": "uni0041", - "66": "uni0042", - "67": "uni0043", - "68": "uni0044", - "69": "uni0045", - "70": "uni0046", - "71": "uni0047", - "72": "uni0048", - "73": "uni0049", - "74": "uni004a", - "75": "uni004b", - "76": "uni004c", - "77": "uni004d", - "78": "uni004e", - "79": "uni004f", - "80": "uni0050", - "81": "uni0051", - "82": "uni0052", - "83": "uni0053", - "84": "uni0054", - "85": "uni0055", - "86": "uni0056", - "87": "uni0057", - "88": "uni0058", - "89": "uni0059", - "90": "uni005a", - "91": "uni005b", - "92": "uni005c", - "93": "uni005d", - "94": "uni005e", - "95": "uni005f", - "96": "uni0060", - "97": "uni0061", - "98": "uni0062", - "99": "uni0063", - "100": "uni0064", - "101": "uni0065", - "102": "uni0066", - "103": "uni0067", - "104": "uni0068", - "105": "uni0069", - "106": "uni006a", - "107": "uni006b", - "108": "uni006c", - "109": "uni006d", - "110": "uni006e", - "111": "uni006f", - "112": "uni0070", - "113": "uni0071", - "114": "uni0072", - "115": "uni0073", - "116": "uni0074", - "117": "uni0075", - "118": "uni0076", - "119": "uni0077", - "120": "uni0078", - "121": "uni0079", - "122": "uni007a", - "123": "uni007b", - "124": "uni007c", - "125": "uni007d", - "126": "uni007e", - "160": "uni00a0", - "161": "uni00a1", - "162": "uni00a2", - "163": "uni00a3", - "164": "uni00a4", - "165": "uni00a5", - "166": "uni00a6", - "167": "uni00a7", - "168": "uni00a8", - "169": "uni00a9", - "170": "uni00aa", - "171": "uni00ab", - "172": "uni00ac", - "173": "uni00ad", - "174": "uni00ae", - "175": "uni00af", - "176": "uni00b0", - "177": "uni00b1", - "178": "uni00b2", - "179": "uni00b3", - "180": "uni00b4", - "181": "uni00b5", - "182": "uni00b6", - "183": "uni00b7", - "184": "uni00b8", - "185": "uni00b9", - "186": "uni00ba", - "187": "uni00bb", - "188": "uni00bc", - "189": "uni00bd", - "190": "uni00be", - "191": "uni00bf", - "192": "uni00c0", - "193": "uni00c1", - "194": "uni00c2", - "195": "uni00c3", - "196": "uni00c4", - "197": "uni00c5", - "198": "uni00c6", - "199": "uni00c7", - "200": "uni00c8", - "201": "uni00c9", - "202": "uni00ca", - "203": "uni00cb", - "204": "uni00cc", - "205": "uni00cd", - "206": "uni00ce", - "207": "uni00cf", - "208": "uni00d0", - "209": "uni00d1", - "210": "uni00d2", - "211": "uni00d3", - "212": "uni00d4", - "213": "uni00d5", - "214": "uni00d6", - "215": "uni00d7", - "216": "uni00d8", - "217": "uni00d9", - "218": "uni00da", - "219": "uni00db", - "220": "uni00dc", - "221": "uni00dd", - "222": "uni00de", - "223": "uni00df", - "224": "uni00e0", - "225": "uni00e1", - "226": "uni00e2", - "227": "uni00e3", - "228": "uni00e4", - "229": "uni00e5", - "230": "uni00e6", - "231": "uni00e7", - "232": "uni00e8", - "233": "uni00e9", - "234": "uni00ea", - "235": "uni00eb", - "236": "uni00ec", - "237": "uni00ed", - "238": "uni00ee", - "239": "uni00ef", - "240": "uni00f0", - "241": "uni00f1", - "242": "uni00f2", - "243": "uni00f3", - "244": "uni00f4", - "245": "uni00f5", - "246": "uni00f6", - "247": "uni00f7", - "248": "uni00f8", - "249": "uni00f9", - "250": "uni00fa", - "251": "uni00fb", - "252": "uni00fc", - "253": "uni00fd", - "254": "uni00fe", - "255": "uni00ff", - "305": "uni0131", - "338": "uni0152", - "339": "uni0153", - "700": "uni02bc", - "710": "uni02c6", - "730": "uni02da", - "732": "uni02dc", - "8194": "uni2002", - "8201": "uni2009", - "8203": "uni200b", - "8211": "uni2013", - "8212": "uni2014", - "8216": "uni2018", - "8217": "uni2019", - "8218": "uni201a", - "8220": "uni201c", - "8221": "uni201d", - "8222": "uni201e", - "8226": "uni2022", - "8230": "uni2026", - "8242": "uni2032", - "8243": "uni2033", - "8249": "uni2039", - "8250": "uni203a", - "8260": "uni2044", - "8308": "uni2074", - "8364": "uni20ac", - "8482": "uni2122", - "8722": "uni2212", - "65279": "unifeff", - "65533": "unifffd" - }, - "isUnicode": true, - "EncodingScheme": "FontSpecific", - "FontName": "Roboto Medium", - "FullName": "Roboto Medium", - "Version": "Version 2.137; 2017", - "PostScriptName": "Roboto-Medium", - "Weight": "Bold", - "ItalicAngle": "0", - "IsFixedPitch": "false", - "UnderlineThickness": "49", - "UnderlinePosition": "-73", - "FontHeightOffset": "0", - "Ascender": "928", - "Descender": "-244", - "FontBBox": [ - "-732", - "-271", - "1170", - "1056" - ], - "StartCharMetrics": "248", - "C": { - "0": 0, - "13": 249, - "32": 249, - "33": 268, - "34": 324, - "35": 610, - "36": 568, - "37": 734, - "38": 639, - "39": 169, - "40": 349, - "41": 353, - "42": 442, - "43": 557, - "44": 220, - "45": 328, - "46": 279, - "47": 396, - "48": 568, - "49": 568, - "50": 568, - "51": 568, - "52": 568, - "53": 568, - "54": 568, - "55": 568, - "56": 568, - "57": 568, - "58": 265, - "59": 238, - "60": 508, - "61": 560, - "62": 521, - "63": 486, - "64": 895, - "65": 666, - "66": 631, - "67": 653, - "68": 653, - "69": 565, - "70": 549, - "71": 681, - "72": 710, - "73": 282, - "74": 555, - "75": 630, - "76": 541, - "77": 875, - "78": 710, - "79": 690, - "80": 639, - "81": 690, - "82": 624, - "83": 604, - "84": 607, - "85": 652, - "86": 647, - "87": 880, - "88": 633, - "89": 609, - "90": 602, - "91": 274, - "92": 418, - "93": 274, - "94": 427, - "95": 451, - "96": 322, - "97": 541, - "98": 563, - "99": 523, - "100": 564, - "101": 537, - "102": 354, - "103": 567, - "104": 555, - "105": 255, - "106": 250, - "107": 522, - "108": 255, - "109": 870, - "110": 556, - "111": 569, - "112": 563, - "113": 568, - "114": 352, - "115": 516, - "116": 333, - "117": 556, - "118": 495, - "119": 743, - "120": 503, - "121": 487, - "122": 503, - "123": 335, - "124": 251, - "125": 335, - "126": 665, - "160": 249, - "161": 265, - "162": 561, - "163": 588, - "164": 702, - "165": 531, - "166": 248, - "167": 621, - "168": 440, - "169": 783, - "170": 446, - "171": 485, - "172": 553, - "173": 328, - "174": 783, - "175": 482, - "176": 380, - "177": 536, - "178": 370, - "179": 370, - "180": 326, - "181": 591, - "182": 491, - "183": 282, - "184": 258, - "185": 370, - "186": 457, - "187": 485, - "188": 727, - "189": 771, - "190": 792, - "191": 486, - "192": 666, - "193": 666, - "194": 666, - "195": 666, - "196": 666, - "197": 666, - "198": 940, - "199": 653, - "200": 565, - "201": 565, - "202": 565, - "203": 565, - "204": 282, - "205": 282, - "206": 282, - "207": 282, - "208": 668, - "209": 710, - "210": 690, - "211": 690, - "212": 690, - "213": 690, - "214": 690, - "215": 533, - "216": 689, - "217": 652, - "218": 652, - "219": 652, - "220": 652, - "221": 609, - "222": 599, - "223": 613, - "224": 541, - "225": 541, - "226": 541, - "227": 541, - "228": 541, - "229": 541, - "230": 844, - "231": 523, - "232": 537, - "233": 537, - "234": 537, - "235": 537, - "236": 263, - "237": 263, - "238": 263, - "239": 263, - "240": 582, - "241": 556, - "242": 569, - "243": 569, - "244": 569, - "245": 569, - "246": 569, - "247": 571, - "248": 566, - "249": 556, - "250": 556, - "251": 556, - "252": 556, - "253": 487, - "254": 574, - "255": 487, - "305": 263, - "338": 963, - "339": 903, - "700": 217, - "710": 487, - "730": 337, - "732": 480, - "8194": 510, - "8201": 204, - "8203": 0, - "8211": 645, - "8212": 773, - "8216": 219, - "8217": 217, - "8218": 226, - "8220": 385, - "8221": 388, - "8222": 379, - "8226": 349, - "8230": 706, - "8242": 169, - "8243": 324, - "8249": 306, - "8250": 301, - "8260": 451, - "8308": 370, - "8364": 568, - "8482": 629, - "8722": 564, - "65279": 0, - "65533": 1026 - }, - "CIDtoGID_Compressed": true, - "CIDtoGID": "eJzt0FPPYGcYhtGrqW3btm3btm3bZmrzpP0NtW3btk47TeZgOplpJ+1MvyZdK3n362ffezdawzP6cHeGNEZjNlZjN07jNl7jN0ETNlETN0mTNlmTN0VTNlVTN03TNl3TN0MzNlMzN0uzNluzN0dzNldzN0\/zNl\/zt0ALtlALt0iLtliLt0RLtlRLt0zLtlzLt0IrtlIrt0qrtlqrt0ZrtlZrt07rtl7rt0EbtlEbt0mbtlmbt0VbtlVbt03btl3bt0M7tlM7t0u7ttsIfeGfu7vd26M926u926d926\/9O6ADO6h7OrhDOrTDOrwjOrKjOrpjOrbjOr4TOrGTOrlTuq\/7e6AHe6iHO7VHerTHerwnerKnerpnurdne67ne6EXe6nTOr2Xe6VXe63XO6Mze6M3e6u3e6d3O6v3er8P+rCP+rhP+rTPOrvP+6Iv+6qv+6ZzOrdv+67v+6EfO6+fRsIf+Cvn\/+MKF3ThSMgB\/x2\/DmPtohG8e\/GgdsnIiwIAAAAAAAAAAAAAAAAAwH\/MpX+YXTaoXT7UiSu6cvDoqq7umkH9tV3X9YPXbhjc3zic+j\/3yxCzm7p5GGduGeG0f8+to7j+0G77l983kG4f6ACMUncMdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\/mfuHOgADJi7fn\/8Bsu+aH4=", - "_version_": 6 -} \ No newline at end of file diff --git a/storage/fonts/roboto_500_ea0fdb6a5a091a75340659ff9fb153c5.ttf b/storage/fonts/roboto_500_ea0fdb6a5a091a75340659ff9fb153c5.ttf deleted file mode 100644 index dd04ff19..00000000 Binary files a/storage/fonts/roboto_500_ea0fdb6a5a091a75340659ff9fb153c5.ttf and /dev/null differ diff --git a/storage/fonts/roboto_500_ea0fdb6a5a091a75340659ff9fb153c5.ufm b/storage/fonts/roboto_500_ea0fdb6a5a091a75340659ff9fb153c5.ufm deleted file mode 100644 index 0cfa4e5c..00000000 --- a/storage/fonts/roboto_500_ea0fdb6a5a091a75340659ff9fb153c5.ufm +++ /dev/null @@ -1,248 +0,0 @@ -StartFontMetrics 4.1 -Notice Converted by PHP-font-lib -Comment https://github.com/PhenX/php-font-lib -EncodingScheme FontSpecific -Copyright Copyright 2011 Google Inc. All Rights Reserved. -FontName Roboto Medium -FontSubfamily Regular -UniqueID Roboto Medium -FullName Roboto Medium -Version Version 2.137; 2017 -PostScriptName Roboto-Medium -LicenseURL http://www.apache.org/licenses/LICENSE-2.0 -Weight Bold -ItalicAngle 0 -IsFixedPitch false -UnderlineThickness 49 -UnderlinePosition -73 -FontHeightOffset 0 -Ascender 928 -Descender -244 -FontBBox -732 -271 1170 1056 -StartCharMetrics 248 -U 0 ; WX 0 ; N uni0000 ; G 1 -U 13 ; WX 249 ; N uni000d ; G 3 -U 32 ; WX 249 ; N uni0020 ; G 4 -U 33 ; WX 268 ; N uni0021 ; G 5 -U 34 ; WX 324 ; N uni0022 ; G 6 -U 35 ; WX 610 ; N uni0023 ; G 7 -U 36 ; WX 568 ; N uni0024 ; G 8 -U 37 ; WX 734 ; N uni0025 ; G 9 -U 38 ; WX 639 ; N uni0026 ; G 10 -U 39 ; WX 169 ; N uni0027 ; G 11 -U 40 ; WX 349 ; N uni0028 ; G 12 -U 41 ; WX 353 ; N uni0029 ; G 13 -U 42 ; WX 442 ; N uni002a ; G 14 -U 43 ; WX 557 ; N uni002b ; G 15 -U 44 ; WX 220 ; N uni002c ; G 16 -U 45 ; WX 328 ; N uni002d ; G 17 -U 46 ; WX 279 ; N uni002e ; G 18 -U 47 ; WX 396 ; N uni002f ; G 19 -U 48 ; WX 568 ; N uni0030 ; G 20 -U 49 ; WX 568 ; N uni0031 ; G 21 -U 50 ; WX 568 ; N uni0032 ; G 22 -U 51 ; WX 568 ; N uni0033 ; G 23 -U 52 ; WX 568 ; N uni0034 ; G 24 -U 53 ; WX 568 ; N uni0035 ; G 25 -U 54 ; WX 568 ; N uni0036 ; G 26 -U 55 ; WX 568 ; N uni0037 ; G 27 -U 56 ; WX 568 ; N uni0038 ; G 28 -U 57 ; WX 568 ; N uni0039 ; G 29 -U 58 ; WX 265 ; N uni003a ; G 30 -U 59 ; WX 238 ; N uni003b ; G 31 -U 60 ; WX 508 ; N uni003c ; G 32 -U 61 ; WX 560 ; N uni003d ; G 33 -U 62 ; WX 521 ; N uni003e ; G 34 -U 63 ; WX 486 ; N uni003f ; G 35 -U 64 ; WX 895 ; N uni0040 ; G 36 -U 65 ; WX 666 ; N uni0041 ; G 37 -U 66 ; WX 631 ; N uni0042 ; G 38 -U 67 ; WX 653 ; N uni0043 ; G 39 -U 68 ; WX 653 ; N uni0044 ; G 40 -U 69 ; WX 565 ; N uni0045 ; G 41 -U 70 ; WX 549 ; N uni0046 ; G 42 -U 71 ; WX 681 ; N uni0047 ; G 43 -U 72 ; WX 710 ; N uni0048 ; G 44 -U 73 ; WX 282 ; N uni0049 ; G 45 -U 74 ; WX 555 ; N uni004a ; G 46 -U 75 ; WX 630 ; N uni004b ; G 47 -U 76 ; WX 541 ; N uni004c ; G 48 -U 77 ; WX 875 ; N uni004d ; G 49 -U 78 ; WX 710 ; N uni004e ; G 50 -U 79 ; WX 690 ; N uni004f ; G 51 -U 80 ; WX 639 ; N uni0050 ; G 52 -U 81 ; WX 690 ; N uni0051 ; G 53 -U 82 ; WX 624 ; N uni0052 ; G 54 -U 83 ; WX 604 ; N uni0053 ; G 55 -U 84 ; WX 607 ; N uni0054 ; G 56 -U 85 ; WX 652 ; N uni0055 ; G 57 -U 86 ; WX 647 ; N uni0056 ; G 58 -U 87 ; WX 880 ; N uni0057 ; G 59 -U 88 ; WX 633 ; N uni0058 ; G 60 -U 89 ; WX 609 ; N uni0059 ; G 61 -U 90 ; WX 602 ; N uni005a ; G 62 -U 91 ; WX 274 ; N uni005b ; G 63 -U 92 ; WX 418 ; N uni005c ; G 64 -U 93 ; WX 274 ; N uni005d ; G 65 -U 94 ; WX 427 ; N uni005e ; G 66 -U 95 ; WX 451 ; N uni005f ; G 67 -U 96 ; WX 322 ; N uni0060 ; G 68 -U 97 ; WX 541 ; N uni0061 ; G 69 -U 98 ; WX 563 ; N uni0062 ; G 70 -U 99 ; WX 523 ; N uni0063 ; G 71 -U 100 ; WX 564 ; N uni0064 ; G 72 -U 101 ; WX 537 ; N uni0065 ; G 73 -U 102 ; WX 354 ; N uni0066 ; G 74 -U 103 ; WX 567 ; N uni0067 ; G 75 -U 104 ; WX 555 ; N uni0068 ; G 76 -U 105 ; WX 255 ; N uni0069 ; G 77 -U 106 ; WX 250 ; N uni006a ; G 78 -U 107 ; WX 522 ; N uni006b ; G 79 -U 108 ; WX 255 ; N uni006c ; G 80 -U 109 ; WX 870 ; N uni006d ; G 81 -U 110 ; WX 556 ; N uni006e ; G 82 -U 111 ; WX 569 ; N uni006f ; G 83 -U 112 ; WX 563 ; N uni0070 ; G 84 -U 113 ; WX 568 ; N uni0071 ; G 85 -U 114 ; WX 352 ; N uni0072 ; G 86 -U 115 ; WX 516 ; N uni0073 ; G 87 -U 116 ; WX 333 ; N uni0074 ; G 88 -U 117 ; WX 556 ; N uni0075 ; G 89 -U 118 ; WX 495 ; N uni0076 ; G 90 -U 119 ; WX 743 ; N uni0077 ; G 91 -U 120 ; WX 503 ; N uni0078 ; G 92 -U 121 ; WX 487 ; N uni0079 ; G 93 -U 122 ; WX 503 ; N uni007a ; G 94 -U 123 ; WX 335 ; N uni007b ; G 95 -U 124 ; WX 251 ; N uni007c ; G 96 -U 125 ; WX 335 ; N uni007d ; G 97 -U 126 ; WX 665 ; N uni007e ; G 98 -U 160 ; WX 249 ; N uni00a0 ; G 189 -U 161 ; WX 265 ; N uni00a1 ; G 99 -U 162 ; WX 561 ; N uni00a2 ; G 100 -U 163 ; WX 588 ; N uni00a3 ; G 101 -U 164 ; WX 702 ; N uni00a4 ; G 102 -U 165 ; WX 531 ; N uni00a5 ; G 103 -U 166 ; WX 248 ; N uni00a6 ; G 104 -U 167 ; WX 621 ; N uni00a7 ; G 105 -U 168 ; WX 440 ; N uni00a8 ; G 106 -U 169 ; WX 783 ; N uni00a9 ; G 107 -U 170 ; WX 446 ; N uni00aa ; G 108 -U 171 ; WX 485 ; N uni00ab ; G 109 -U 172 ; WX 553 ; N uni00ac ; G 110 -U 173 ; WX 328 ; N uni00ad ; G 190 -U 174 ; WX 783 ; N uni00ae ; G 111 -U 175 ; WX 482 ; N uni00af ; G 112 -U 176 ; WX 380 ; N uni00b0 ; G 113 -U 177 ; WX 536 ; N uni00b1 ; G 114 -U 178 ; WX 370 ; N uni00b2 ; G 115 -U 179 ; WX 370 ; N uni00b3 ; G 116 -U 180 ; WX 326 ; N uni00b4 ; G 117 -U 181 ; WX 591 ; N uni00b5 ; G 118 -U 182 ; WX 491 ; N uni00b6 ; G 119 -U 183 ; WX 282 ; N uni00b7 ; G 120 -U 184 ; WX 258 ; N uni00b8 ; G 121 -U 185 ; WX 370 ; N uni00b9 ; G 122 -U 186 ; WX 457 ; N uni00ba ; G 123 -U 187 ; WX 485 ; N uni00bb ; G 124 -U 188 ; WX 727 ; N uni00bc ; G 125 -U 189 ; WX 771 ; N uni00bd ; G 126 -U 190 ; WX 792 ; N uni00be ; G 127 -U 191 ; WX 486 ; N uni00bf ; G 128 -U 192 ; WX 666 ; N uni00c0 ; G 192 -U 193 ; WX 666 ; N uni00c1 ; G 193 -U 194 ; WX 666 ; N uni00c2 ; G 194 -U 195 ; WX 666 ; N uni00c3 ; G 195 -U 196 ; WX 666 ; N uni00c4 ; G 196 -U 197 ; WX 666 ; N uni00c5 ; G 197 -U 198 ; WX 940 ; N uni00c6 ; G 129 -U 199 ; WX 653 ; N uni00c7 ; G 198 -U 200 ; WX 565 ; N uni00c8 ; G 199 -U 201 ; WX 565 ; N uni00c9 ; G 200 -U 202 ; WX 565 ; N uni00ca ; G 201 -U 203 ; WX 565 ; N uni00cb ; G 202 -U 204 ; WX 282 ; N uni00cc ; G 203 -U 205 ; WX 282 ; N uni00cd ; G 204 -U 206 ; WX 282 ; N uni00ce ; G 205 -U 207 ; WX 282 ; N uni00cf ; G 206 -U 208 ; WX 668 ; N uni00d0 ; G 191 -U 209 ; WX 710 ; N uni00d1 ; G 207 -U 210 ; WX 690 ; N uni00d2 ; G 208 -U 211 ; WX 690 ; N uni00d3 ; G 209 -U 212 ; WX 690 ; N uni00d4 ; G 210 -U 213 ; WX 690 ; N uni00d5 ; G 211 -U 214 ; WX 690 ; N uni00d6 ; G 212 -U 215 ; WX 533 ; N uni00d7 ; G 130 -U 216 ; WX 689 ; N uni00d8 ; G 131 -U 217 ; WX 652 ; N uni00d9 ; G 213 -U 218 ; WX 652 ; N uni00da ; G 214 -U 219 ; WX 652 ; N uni00db ; G 215 -U 220 ; WX 652 ; N uni00dc ; G 216 -U 221 ; WX 609 ; N uni00dd ; G 217 -U 222 ; WX 599 ; N uni00de ; G 132 -U 223 ; WX 613 ; N uni00df ; G 133 -U 224 ; WX 541 ; N uni00e0 ; G 218 -U 225 ; WX 541 ; N uni00e1 ; G 219 -U 226 ; WX 541 ; N uni00e2 ; G 220 -U 227 ; WX 541 ; N uni00e3 ; G 221 -U 228 ; WX 541 ; N uni00e4 ; G 222 -U 229 ; WX 541 ; N uni00e5 ; G 223 -U 230 ; WX 844 ; N uni00e6 ; G 134 -U 231 ; WX 523 ; N uni00e7 ; G 224 -U 232 ; WX 537 ; N uni00e8 ; G 225 -U 233 ; WX 537 ; N uni00e9 ; G 226 -U 234 ; WX 537 ; N uni00ea ; G 227 -U 235 ; WX 537 ; N uni00eb ; G 228 -U 236 ; WX 263 ; N uni00ec ; G 229 -U 237 ; WX 263 ; N uni00ed ; G 230 -U 238 ; WX 263 ; N uni00ee ; G 231 -U 239 ; WX 263 ; N uni00ef ; G 232 -U 240 ; WX 582 ; N uni00f0 ; G 135 -U 241 ; WX 556 ; N uni00f1 ; G 233 -U 242 ; WX 569 ; N uni00f2 ; G 234 -U 243 ; WX 569 ; N uni00f3 ; G 235 -U 244 ; WX 569 ; N uni00f4 ; G 236 -U 245 ; WX 569 ; N uni00f5 ; G 237 -U 246 ; WX 569 ; N uni00f6 ; G 238 -U 247 ; WX 571 ; N uni00f7 ; G 136 -U 248 ; WX 566 ; N uni00f8 ; G 137 -U 249 ; WX 556 ; N uni00f9 ; G 239 -U 250 ; WX 556 ; N uni00fa ; G 240 -U 251 ; WX 556 ; N uni00fb ; G 241 -U 252 ; WX 556 ; N uni00fc ; G 242 -U 253 ; WX 487 ; N uni00fd ; G 243 -U 254 ; WX 574 ; N uni00fe ; G 138 -U 255 ; WX 487 ; N uni00ff ; G 244 -U 305 ; WX 263 ; N uni0131 ; G 139 -U 338 ; WX 963 ; N uni0152 ; G 140 -U 339 ; WX 903 ; N uni0153 ; G 141 -U 700 ; WX 217 ; N uni02bc ; G 247 -U 710 ; WX 487 ; N uni02c6 ; G 142 -U 730 ; WX 337 ; N uni02da ; G 143 -U 732 ; WX 480 ; N uni02dc ; G 144 -U 8194 ; WX 510 ; N uni2002 ; G 145 -U 8201 ; WX 204 ; N uni2009 ; G 146 -U 8203 ; WX 0 ; N uni200b ; G 148 -U 8211 ; WX 645 ; N uni2013 ; G 149 -U 8212 ; WX 773 ; N uni2014 ; G 150 -U 8216 ; WX 219 ; N uni2018 ; G 151 -U 8217 ; WX 217 ; N uni2019 ; G 152 -U 8218 ; WX 226 ; N uni201a ; G 153 -U 8220 ; WX 385 ; N uni201c ; G 154 -U 8221 ; WX 388 ; N uni201d ; G 155 -U 8222 ; WX 379 ; N uni201e ; G 156 -U 8226 ; WX 349 ; N uni2022 ; G 157 -U 8230 ; WX 706 ; N uni2026 ; G 158 -U 8242 ; WX 169 ; N uni2032 ; G 245 -U 8243 ; WX 324 ; N uni2033 ; G 246 -U 8249 ; WX 306 ; N uni2039 ; G 159 -U 8250 ; WX 301 ; N uni203a ; G 160 -U 8260 ; WX 451 ; N uni2044 ; G 161 -U 8308 ; WX 370 ; N uni2074 ; G 162 -U 8364 ; WX 568 ; N uni20ac ; G 163 -U 8482 ; WX 629 ; N uni2122 ; G 164 -U 8722 ; WX 564 ; N uni2212 ; G 165 -U 65279 ; WX 0 ; N unifeff ; G 170 -U 65533 ; WX 1026 ; N unifffd ; G 171 -EndCharMetrics -EndFontMetrics diff --git a/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ttf b/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ttf deleted file mode 100644 index ea06a634..00000000 Binary files a/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ttf and /dev/null differ diff --git a/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ufm b/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ufm deleted file mode 100644 index 981d2f67..00000000 --- a/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ufm +++ /dev/null @@ -1,248 +0,0 @@ -StartFontMetrics 4.1 -Notice Converted by PHP-font-lib -Comment https://github.com/PhenX/php-font-lib -EncodingScheme FontSpecific -Copyright Copyright 2011 Google Inc. All Rights Reserved. -FontName Roboto -FontSubfamily Bold -UniqueID Roboto Bold -FullName Roboto Bold -Version Version 2.137; 2017 -PostScriptName Roboto-Bold -LicenseURL http://www.apache.org/licenses/LICENSE-2.0 -Weight Bold -ItalicAngle 0 -IsFixedPitch false -UnderlineThickness 49 -UnderlinePosition -73 -FontHeightOffset 0 -Ascender 928 -Descender -244 -FontBBox -727 -271 1191 1056 -StartCharMetrics 248 -U 0 ; WX 0 ; N uni0000 ; G 1 -U 13 ; WX 249 ; N uni000d ; G 3 -U 32 ; WX 249 ; N uni0020 ; G 4 -U 33 ; WX 272 ; N uni0021 ; G 5 -U 34 ; WX 321 ; N uni0022 ; G 6 -U 35 ; WX 596 ; N uni0023 ; G 7 -U 36 ; WX 574 ; N uni0024 ; G 8 -U 37 ; WX 738 ; N uni0025 ; G 9 -U 38 ; WX 656 ; N uni0026 ; G 10 -U 39 ; WX 162 ; N uni0027 ; G 11 -U 40 ; WX 351 ; N uni0028 ; G 12 -U 41 ; WX 353 ; N uni0029 ; G 13 -U 42 ; WX 453 ; N uni002a ; G 14 -U 43 ; WX 546 ; N uni002b ; G 15 -U 44 ; WX 244 ; N uni002c ; G 16 -U 45 ; WX 388 ; N uni002d ; G 17 -U 46 ; WX 291 ; N uni002e ; G 18 -U 47 ; WX 374 ; N uni002f ; G 19 -U 48 ; WX 574 ; N uni0030 ; G 20 -U 49 ; WX 574 ; N uni0031 ; G 21 -U 50 ; WX 574 ; N uni0032 ; G 22 -U 51 ; WX 574 ; N uni0033 ; G 23 -U 52 ; WX 574 ; N uni0034 ; G 24 -U 53 ; WX 574 ; N uni0035 ; G 25 -U 54 ; WX 574 ; N uni0036 ; G 26 -U 55 ; WX 574 ; N uni0037 ; G 27 -U 56 ; WX 574 ; N uni0038 ; G 28 -U 57 ; WX 574 ; N uni0039 ; G 29 -U 58 ; WX 282 ; N uni003a ; G 30 -U 59 ; WX 262 ; N uni003b ; G 31 -U 60 ; WX 509 ; N uni003c ; G 32 -U 61 ; WX 572 ; N uni003d ; G 33 -U 62 ; WX 517 ; N uni003e ; G 34 -U 63 ; WX 498 ; N uni003f ; G 35 -U 64 ; WX 895 ; N uni0040 ; G 36 -U 65 ; WX 673 ; N uni0041 ; G 37 -U 66 ; WX 638 ; N uni0042 ; G 38 -U 67 ; WX 654 ; N uni0043 ; G 39 -U 68 ; WX 650 ; N uni0044 ; G 40 -U 69 ; WX 563 ; N uni0045 ; G 41 -U 70 ; WX 548 ; N uni0046 ; G 42 -U 71 ; WX 681 ; N uni0047 ; G 43 -U 72 ; WX 707 ; N uni0048 ; G 44 -U 73 ; WX 292 ; N uni0049 ; G 45 -U 74 ; WX 559 ; N uni004a ; G 46 -U 75 ; WX 635 ; N uni004b ; G 47 -U 76 ; WX 542 ; N uni004c ; G 48 -U 77 ; WX 876 ; N uni004d ; G 49 -U 78 ; WX 706 ; N uni004e ; G 50 -U 79 ; WX 690 ; N uni004f ; G 51 -U 80 ; WX 645 ; N uni0050 ; G 52 -U 81 ; WX 690 ; N uni0051 ; G 53 -U 82 ; WX 638 ; N uni0052 ; G 54 -U 83 ; WX 615 ; N uni0053 ; G 55 -U 84 ; WX 619 ; N uni0054 ; G 56 -U 85 ; WX 658 ; N uni0055 ; G 57 -U 86 ; WX 654 ; N uni0056 ; G 58 -U 87 ; WX 875 ; N uni0057 ; G 59 -U 88 ; WX 635 ; N uni0058 ; G 60 -U 89 ; WX 618 ; N uni0059 ; G 61 -U 90 ; WX 606 ; N uni005a ; G 62 -U 91 ; WX 278 ; N uni005b ; G 63 -U 92 ; WX 422 ; N uni005c ; G 64 -U 93 ; WX 278 ; N uni005d ; G 65 -U 94 ; WX 437 ; N uni005e ; G 66 -U 95 ; WX 446 ; N uni005f ; G 67 -U 96 ; WX 331 ; N uni0060 ; G 68 -U 97 ; WX 536 ; N uni0061 ; G 69 -U 98 ; WX 563 ; N uni0062 ; G 70 -U 99 ; WX 521 ; N uni0063 ; G 71 -U 100 ; WX 563 ; N uni0064 ; G 72 -U 101 ; WX 541 ; N uni0065 ; G 73 -U 102 ; WX 358 ; N uni0066 ; G 74 -U 103 ; WX 571 ; N uni0067 ; G 75 -U 104 ; WX 560 ; N uni0068 ; G 76 -U 105 ; WX 265 ; N uni0069 ; G 77 -U 106 ; WX 260 ; N uni006a ; G 78 -U 107 ; WX 534 ; N uni006b ; G 79 -U 108 ; WX 265 ; N uni006c ; G 80 -U 109 ; WX 866 ; N uni006d ; G 81 -U 110 ; WX 560 ; N uni006e ; G 82 -U 111 ; WX 565 ; N uni006f ; G 83 -U 112 ; WX 563 ; N uni0070 ; G 84 -U 113 ; WX 565 ; N uni0071 ; G 85 -U 114 ; WX 365 ; N uni0072 ; G 86 -U 115 ; WX 514 ; N uni0073 ; G 87 -U 116 ; WX 338 ; N uni0074 ; G 88 -U 117 ; WX 560 ; N uni0075 ; G 89 -U 118 ; WX 505 ; N uni0076 ; G 90 -U 119 ; WX 735 ; N uni0077 ; G 91 -U 120 ; WX 509 ; N uni0078 ; G 92 -U 121 ; WX 502 ; N uni0079 ; G 93 -U 122 ; WX 509 ; N uni007a ; G 94 -U 123 ; WX 330 ; N uni007b ; G 95 -U 124 ; WX 253 ; N uni007c ; G 96 -U 125 ; WX 330 ; N uni007d ; G 97 -U 126 ; WX 648 ; N uni007e ; G 98 -U 160 ; WX 249 ; N uni00a0 ; G 189 -U 161 ; WX 282 ; N uni00a1 ; G 99 -U 162 ; WX 575 ; N uni00a2 ; G 100 -U 163 ; WX 594 ; N uni00a3 ; G 101 -U 164 ; WX 692 ; N uni00a4 ; G 102 -U 165 ; WX 536 ; N uni00a5 ; G 103 -U 166 ; WX 252 ; N uni00a6 ; G 104 -U 167 ; WX 628 ; N uni00a7 ; G 105 -U 168 ; WX 467 ; N uni00a8 ; G 106 -U 169 ; WX 784 ; N uni00a9 ; G 107 -U 170 ; WX 444 ; N uni00aa ; G 108 -U 171 ; WX 500 ; N uni00ab ; G 109 -U 172 ; WX 551 ; N uni00ac ; G 110 -U 173 ; WX 388 ; N uni00ad ; G 190 -U 174 ; WX 784 ; N uni00ae ; G 111 -U 175 ; WX 501 ; N uni00af ; G 112 -U 176 ; WX 388 ; N uni00b0 ; G 113 -U 177 ; WX 537 ; N uni00b1 ; G 114 -U 178 ; WX 373 ; N uni00b2 ; G 115 -U 179 ; WX 373 ; N uni00b3 ; G 116 -U 180 ; WX 332 ; N uni00b4 ; G 117 -U 181 ; WX 616 ; N uni00b5 ; G 118 -U 182 ; WX 490 ; N uni00b6 ; G 119 -U 183 ; WX 301 ; N uni00b7 ; G 120 -U 184 ; WX 268 ; N uni00b8 ; G 121 -U 185 ; WX 373 ; N uni00b9 ; G 122 -U 186 ; WX 457 ; N uni00ba ; G 123 -U 187 ; WX 500 ; N uni00bb ; G 124 -U 188 ; WX 718 ; N uni00bc ; G 125 -U 189 ; WX 761 ; N uni00bd ; G 126 -U 190 ; WX 808 ; N uni00be ; G 127 -U 191 ; WX 498 ; N uni00bf ; G 128 -U 192 ; WX 673 ; N uni00c0 ; G 192 -U 193 ; WX 673 ; N uni00c1 ; G 193 -U 194 ; WX 673 ; N uni00c2 ; G 194 -U 195 ; WX 673 ; N uni00c3 ; G 195 -U 196 ; WX 673 ; N uni00c4 ; G 196 -U 197 ; WX 673 ; N uni00c5 ; G 197 -U 198 ; WX 940 ; N uni00c6 ; G 129 -U 199 ; WX 654 ; N uni00c7 ; G 198 -U 200 ; WX 563 ; N uni00c8 ; G 199 -U 201 ; WX 563 ; N uni00c9 ; G 200 -U 202 ; WX 563 ; N uni00ca ; G 201 -U 203 ; WX 563 ; N uni00cb ; G 202 -U 204 ; WX 292 ; N uni00cc ; G 203 -U 205 ; WX 292 ; N uni00cd ; G 204 -U 206 ; WX 292 ; N uni00ce ; G 205 -U 207 ; WX 292 ; N uni00cf ; G 206 -U 208 ; WX 665 ; N uni00d0 ; G 191 -U 209 ; WX 706 ; N uni00d1 ; G 207 -U 210 ; WX 690 ; N uni00d2 ; G 208 -U 211 ; WX 690 ; N uni00d3 ; G 209 -U 212 ; WX 690 ; N uni00d4 ; G 210 -U 213 ; WX 690 ; N uni00d5 ; G 211 -U 214 ; WX 690 ; N uni00d6 ; G 212 -U 215 ; WX 531 ; N uni00d7 ; G 130 -U 216 ; WX 689 ; N uni00d8 ; G 131 -U 217 ; WX 658 ; N uni00d9 ; G 213 -U 218 ; WX 658 ; N uni00da ; G 214 -U 219 ; WX 658 ; N uni00db ; G 215 -U 220 ; WX 658 ; N uni00dc ; G 216 -U 221 ; WX 618 ; N uni00dd ; G 217 -U 222 ; WX 608 ; N uni00de ; G 132 -U 223 ; WX 631 ; N uni00df ; G 133 -U 224 ; WX 536 ; N uni00e0 ; G 218 -U 225 ; WX 536 ; N uni00e1 ; G 219 -U 226 ; WX 536 ; N uni00e2 ; G 220 -U 227 ; WX 536 ; N uni00e3 ; G 221 -U 228 ; WX 536 ; N uni00e4 ; G 222 -U 229 ; WX 536 ; N uni00e5 ; G 223 -U 230 ; WX 844 ; N uni00e6 ; G 134 -U 231 ; WX 521 ; N uni00e7 ; G 224 -U 232 ; WX 541 ; N uni00e8 ; G 225 -U 233 ; WX 541 ; N uni00e9 ; G 226 -U 234 ; WX 541 ; N uni00ea ; G 227 -U 235 ; WX 541 ; N uni00eb ; G 228 -U 236 ; WX 274 ; N uni00ec ; G 229 -U 237 ; WX 274 ; N uni00ed ; G 230 -U 238 ; WX 274 ; N uni00ee ; G 231 -U 239 ; WX 274 ; N uni00ef ; G 232 -U 240 ; WX 575 ; N uni00f0 ; G 135 -U 241 ; WX 560 ; N uni00f1 ; G 233 -U 242 ; WX 565 ; N uni00f2 ; G 234 -U 243 ; WX 565 ; N uni00f3 ; G 235 -U 244 ; WX 565 ; N uni00f4 ; G 236 -U 245 ; WX 565 ; N uni00f5 ; G 237 -U 246 ; WX 565 ; N uni00f6 ; G 238 -U 247 ; WX 570 ; N uni00f7 ; G 136 -U 248 ; WX 564 ; N uni00f8 ; G 137 -U 249 ; WX 560 ; N uni00f9 ; G 239 -U 250 ; WX 560 ; N uni00fa ; G 240 -U 251 ; WX 560 ; N uni00fb ; G 241 -U 252 ; WX 560 ; N uni00fc ; G 242 -U 253 ; WX 502 ; N uni00fd ; G 243 -U 254 ; WX 567 ; N uni00fe ; G 138 -U 255 ; WX 502 ; N uni00ff ; G 244 -U 305 ; WX 274 ; N uni0131 ; G 139 -U 338 ; WX 968 ; N uni0152 ; G 140 -U 339 ; WX 902 ; N uni0153 ; G 141 -U 700 ; WX 229 ; N uni02bc ; G 247 -U 710 ; WX 496 ; N uni02c6 ; G 142 -U 730 ; WX 333 ; N uni02da ; G 143 -U 732 ; WX 481 ; N uni02dc ; G 144 -U 8194 ; WX 510 ; N uni2002 ; G 145 -U 8201 ; WX 204 ; N uni2009 ; G 146 -U 8203 ; WX 0 ; N uni200b ; G 148 -U 8211 ; WX 632 ; N uni2013 ; G 149 -U 8212 ; WX 763 ; N uni2014 ; G 150 -U 8216 ; WX 234 ; N uni2018 ; G 151 -U 8217 ; WX 229 ; N uni2019 ; G 152 -U 8218 ; WX 248 ; N uni201a ; G 153 -U 8220 ; WX 406 ; N uni201c ; G 154 -U 8221 ; WX 409 ; N uni201d ; G 155 -U 8222 ; WX 403 ; N uni201e ; G 156 -U 8226 ; WX 359 ; N uni2022 ; G 157 -U 8230 ; WX 740 ; N uni2026 ; G 158 -U 8242 ; WX 162 ; N uni2032 ; G 245 -U 8243 ; WX 321 ; N uni2033 ; G 246 -U 8249 ; WX 312 ; N uni2039 ; G 159 -U 8250 ; WX 302 ; N uni203a ; G 160 -U 8260 ; WX 446 ; N uni2044 ; G 161 -U 8308 ; WX 373 ; N uni2074 ; G 162 -U 8364 ; WX 574 ; N uni20ac ; G 163 -U 8482 ; WX 631 ; N uni2122 ; G 164 -U 8722 ; WX 556 ; N uni2212 ; G 165 -U 65279 ; WX 0 ; N unifeff ; G 170 -U 65533 ; WX 1026 ; N unifffd ; G 171 -EndCharMetrics -EndFontMetrics diff --git a/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ufm.json b/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ufm.json deleted file mode 100644 index fd4fd83e..00000000 --- a/storage/fonts/roboto_bold_b915e443d033da031927fe8f39b8b856.ufm.json +++ /dev/null @@ -1,478 +0,0 @@ -{ - "codeToName": { - "0": "uni0000", - "13": "uni000d", - "32": "uni0020", - "33": "uni0021", - "34": "uni0022", - "35": "uni0023", - "36": "uni0024", - "37": "uni0025", - "38": "uni0026", - "39": "uni0027", - "40": "uni0028", - "41": "uni0029", - "42": "uni002a", - "43": "uni002b", - "44": "uni002c", - "45": "uni002d", - "46": "uni002e", - "47": "uni002f", - "48": "uni0030", - "49": "uni0031", - "50": "uni0032", - "51": "uni0033", - "52": "uni0034", - "53": "uni0035", - "54": "uni0036", - "55": "uni0037", - "56": "uni0038", - "57": "uni0039", - "58": "uni003a", - "59": "uni003b", - "60": "uni003c", - "61": "uni003d", - "62": "uni003e", - "63": "uni003f", - "64": "uni0040", - "65": "uni0041", - "66": "uni0042", - "67": "uni0043", - "68": "uni0044", - "69": "uni0045", - "70": "uni0046", - "71": "uni0047", - "72": "uni0048", - "73": "uni0049", - "74": "uni004a", - "75": "uni004b", - "76": "uni004c", - "77": "uni004d", - "78": "uni004e", - "79": "uni004f", - "80": "uni0050", - "81": "uni0051", - "82": "uni0052", - "83": "uni0053", - "84": "uni0054", - "85": "uni0055", - "86": "uni0056", - "87": "uni0057", - "88": "uni0058", - "89": "uni0059", - "90": "uni005a", - "91": "uni005b", - "92": "uni005c", - "93": "uni005d", - "94": "uni005e", - "95": "uni005f", - "96": "uni0060", - "97": "uni0061", - "98": "uni0062", - "99": "uni0063", - "100": "uni0064", - "101": "uni0065", - "102": "uni0066", - "103": "uni0067", - "104": "uni0068", - "105": "uni0069", - "106": "uni006a", - "107": "uni006b", - "108": "uni006c", - "109": "uni006d", - "110": "uni006e", - "111": "uni006f", - "112": "uni0070", - "113": "uni0071", - "114": "uni0072", - "115": "uni0073", - "116": "uni0074", - "117": "uni0075", - "118": "uni0076", - "119": "uni0077", - "120": "uni0078", - "121": "uni0079", - "122": "uni007a", - "123": "uni007b", - "124": "uni007c", - "125": "uni007d", - "126": "uni007e", - "160": "uni00a0", - "161": "uni00a1", - "162": "uni00a2", - "163": "uni00a3", - "164": "uni00a4", - "165": "uni00a5", - "166": "uni00a6", - "167": "uni00a7", - "168": "uni00a8", - "169": "uni00a9", - "170": "uni00aa", - "171": "uni00ab", - "172": "uni00ac", - "173": "uni00ad", - "174": "uni00ae", - "175": "uni00af", - "176": "uni00b0", - "177": "uni00b1", - "178": "uni00b2", - "179": "uni00b3", - "180": "uni00b4", - "181": "uni00b5", - "182": "uni00b6", - "183": "uni00b7", - "184": "uni00b8", - "185": "uni00b9", - "186": "uni00ba", - "187": "uni00bb", - "188": "uni00bc", - "189": "uni00bd", - "190": "uni00be", - "191": "uni00bf", - "192": "uni00c0", - "193": "uni00c1", - "194": "uni00c2", - "195": "uni00c3", - "196": "uni00c4", - "197": "uni00c5", - "198": "uni00c6", - "199": "uni00c7", - "200": "uni00c8", - "201": "uni00c9", - "202": "uni00ca", - "203": "uni00cb", - "204": "uni00cc", - "205": "uni00cd", - "206": "uni00ce", - "207": "uni00cf", - "208": "uni00d0", - "209": "uni00d1", - "210": "uni00d2", - "211": "uni00d3", - "212": "uni00d4", - "213": "uni00d5", - "214": "uni00d6", - "215": "uni00d7", - "216": "uni00d8", - "217": "uni00d9", - "218": "uni00da", - "219": "uni00db", - "220": "uni00dc", - "221": "uni00dd", - "222": "uni00de", - "223": "uni00df", - "224": "uni00e0", - "225": "uni00e1", - "226": "uni00e2", - "227": "uni00e3", - "228": "uni00e4", - "229": "uni00e5", - "230": "uni00e6", - "231": "uni00e7", - "232": "uni00e8", - "233": "uni00e9", - "234": "uni00ea", - "235": "uni00eb", - "236": "uni00ec", - "237": "uni00ed", - "238": "uni00ee", - "239": "uni00ef", - "240": "uni00f0", - "241": "uni00f1", - "242": "uni00f2", - "243": "uni00f3", - "244": "uni00f4", - "245": "uni00f5", - "246": "uni00f6", - "247": "uni00f7", - "248": "uni00f8", - "249": "uni00f9", - "250": "uni00fa", - "251": "uni00fb", - "252": "uni00fc", - "253": "uni00fd", - "254": "uni00fe", - "255": "uni00ff", - "305": "uni0131", - "338": "uni0152", - "339": "uni0153", - "700": "uni02bc", - "710": "uni02c6", - "730": "uni02da", - "732": "uni02dc", - "8194": "uni2002", - "8201": "uni2009", - "8203": "uni200b", - "8211": "uni2013", - "8212": "uni2014", - "8216": "uni2018", - "8217": "uni2019", - "8218": "uni201a", - "8220": "uni201c", - "8221": "uni201d", - "8222": "uni201e", - "8226": "uni2022", - "8230": "uni2026", - "8242": "uni2032", - "8243": "uni2033", - "8249": "uni2039", - "8250": "uni203a", - "8260": "uni2044", - "8308": "uni2074", - "8364": "uni20ac", - "8482": "uni2122", - "8722": "uni2212", - "65279": "unifeff", - "65533": "unifffd" - }, - "isUnicode": true, - "EncodingScheme": "FontSpecific", - "FontName": "Roboto", - "FullName": "Roboto Bold", - "Version": "Version 2.137; 2017", - "PostScriptName": "Roboto-Bold", - "Weight": "Bold", - "ItalicAngle": "0", - "IsFixedPitch": "false", - "UnderlineThickness": "49", - "UnderlinePosition": "-73", - "FontHeightOffset": "0", - "Ascender": "928", - "Descender": "-244", - "FontBBox": [ - "-727", - "-271", - "1191", - "1056" - ], - "StartCharMetrics": "248", - "C": { - "0": 0, - "13": 249, - "32": 249, - "33": 272, - "34": 321, - "35": 596, - "36": 574, - "37": 738, - "38": 656, - "39": 162, - "40": 351, - "41": 353, - "42": 453, - "43": 546, - "44": 244, - "45": 388, - "46": 291, - "47": 374, - "48": 574, - "49": 574, - "50": 574, - "51": 574, - "52": 574, - "53": 574, - "54": 574, - "55": 574, - "56": 574, - "57": 574, - "58": 282, - "59": 262, - "60": 509, - "61": 572, - "62": 517, - "63": 498, - "64": 895, - "65": 673, - "66": 638, - "67": 654, - "68": 650, - "69": 563, - "70": 548, - "71": 681, - "72": 707, - "73": 292, - "74": 559, - "75": 635, - "76": 542, - "77": 876, - "78": 706, - "79": 690, - "80": 645, - "81": 690, - "82": 638, - "83": 615, - "84": 619, - "85": 658, - "86": 654, - "87": 875, - "88": 635, - "89": 618, - "90": 606, - "91": 278, - "92": 422, - "93": 278, - "94": 437, - "95": 446, - "96": 331, - "97": 536, - "98": 563, - "99": 521, - "100": 563, - "101": 541, - "102": 358, - "103": 571, - "104": 560, - "105": 265, - "106": 260, - "107": 534, - "108": 265, - "109": 866, - "110": 560, - "111": 565, - "112": 563, - "113": 565, - "114": 365, - "115": 514, - "116": 338, - "117": 560, - "118": 505, - "119": 735, - "120": 509, - "121": 502, - "122": 509, - "123": 330, - "124": 253, - "125": 330, - "126": 648, - "160": 249, - "161": 282, - "162": 575, - "163": 594, - "164": 692, - "165": 536, - "166": 252, - "167": 628, - "168": 467, - "169": 784, - "170": 444, - "171": 500, - "172": 551, - "173": 388, - "174": 784, - "175": 501, - "176": 388, - "177": 537, - "178": 373, - "179": 373, - "180": 332, - "181": 616, - "182": 490, - "183": 301, - "184": 268, - "185": 373, - "186": 457, - "187": 500, - "188": 718, - "189": 761, - "190": 808, - "191": 498, - "192": 673, - "193": 673, - "194": 673, - "195": 673, - "196": 673, - "197": 673, - "198": 940, - "199": 654, - "200": 563, - "201": 563, - "202": 563, - "203": 563, - "204": 292, - "205": 292, - "206": 292, - "207": 292, - "208": 665, - "209": 706, - "210": 690, - "211": 690, - "212": 690, - "213": 690, - "214": 690, - "215": 531, - "216": 689, - "217": 658, - "218": 658, - "219": 658, - "220": 658, - "221": 618, - "222": 608, - "223": 631, - "224": 536, - "225": 536, - "226": 536, - "227": 536, - "228": 536, - "229": 536, - "230": 844, - "231": 521, - "232": 541, - "233": 541, - "234": 541, - "235": 541, - "236": 274, - "237": 274, - "238": 274, - "239": 274, - "240": 575, - "241": 560, - "242": 565, - "243": 565, - "244": 565, - "245": 565, - "246": 565, - "247": 570, - "248": 564, - "249": 560, - "250": 560, - "251": 560, - "252": 560, - "253": 502, - "254": 567, - "255": 502, - "305": 274, - "338": 968, - "339": 902, - "700": 229, - "710": 496, - "730": 333, - "732": 481, - "8194": 510, - "8201": 204, - "8203": 0, - "8211": 632, - "8212": 763, - "8216": 234, - "8217": 229, - "8218": 248, - "8220": 406, - "8221": 409, - "8222": 403, - "8226": 359, - "8230": 740, - "8242": 162, - "8243": 321, - "8249": 312, - "8250": 302, - "8260": 446, - "8308": 373, - "8364": 574, - "8482": 631, - "8722": 556, - "65279": 0, - "65533": 1026 - }, - "CIDtoGID_Compressed": true, - "CIDtoGID": "eJzt0FPPYGcYhtGrqW3btm3btm3bZmrzpP0NtW3btk47TeZgOplpJ+1MvyZdK3n362ffezdawzP6cHeGNEZjNlZjN07jNl7jN0ETNlETN0mTNlmTN0VTNlVTN03TNl3TN0MzNlMzN0uzNluzN0dzNldzN0\/zNl\/zt0ALtlALt0iLtliLt0RLtlRLt0zLtlzLt0IrtlIrt0qrtlqrt0ZrtlZrt07rtl7rt0EbtlEbt0mbtlmbt0VbtlVbt03btl3bt0M7tlM7t0u7ttsIfeGfu7vd26M926u926d926\/9O6ADO6h7OrhDOrTDOrwjOrKjOrpjOrbjOr4TOrGTOrlTuq\/7e6AHe6iHO7VHerTHerwnerKnerpnurdne67ne6EXe6nTOr2Xe6VXe63XO6Mze6M3e6u3e6d3O6v3er8P+rCP+rhP+rTPOrvP+6Iv+6qv+6ZzOrdv+67v+6EfO6+fRsIf+Cvn\/+MKF3ThSMgB\/x2\/DmPtohG8e\/GgdsnIiwIAAAAAAAAAAAAAAAAAwH\/MpX+YXTaoXT7UiSu6cvDoqq7umkH9tV3X9YPXbhjc3zic+j\/3yxCzm7p5GGduGeG0f8+to7j+0G77l983kG4f6ACMUncMdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\/mfuHOgADJi7fn\/8Bsu+aH4=", - "_version_": 6 -} \ No newline at end of file diff --git a/storage/fonts/roboto_bold_99297763247149b794ebaeda781037cd.ttf b/storage/fonts/roboto_bold_d8a5500bace8c7ad9b0027b9450cfc52.ttf old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_bold_99297763247149b794ebaeda781037cd.ttf rename to storage/fonts/roboto_bold_d8a5500bace8c7ad9b0027b9450cfc52.ttf diff --git a/storage/fonts/roboto_bold_99297763247149b794ebaeda781037cd.ufm b/storage/fonts/roboto_bold_d8a5500bace8c7ad9b0027b9450cfc52.ufm old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_bold_99297763247149b794ebaeda781037cd.ufm rename to storage/fonts/roboto_bold_d8a5500bace8c7ad9b0027b9450cfc52.ufm diff --git a/storage/fonts/roboto_bold_99297763247149b794ebaeda781037cd.ufm.php b/storage/fonts/roboto_bold_d8a5500bace8c7ad9b0027b9450cfc52.ufm.php old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_bold_99297763247149b794ebaeda781037cd.ufm.php rename to storage/fonts/roboto_bold_d8a5500bace8c7ad9b0027b9450cfc52.ufm.php diff --git a/storage/fonts/roboto_normal_0b05025fa87afc0a2692736d55437e3e.ttf b/storage/fonts/roboto_normal_75cc3fda36c0aa28c6afd265b6da53c3.ttf old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_normal_0b05025fa87afc0a2692736d55437e3e.ttf rename to storage/fonts/roboto_normal_75cc3fda36c0aa28c6afd265b6da53c3.ttf diff --git a/storage/fonts/roboto_normal_0b05025fa87afc0a2692736d55437e3e.ufm b/storage/fonts/roboto_normal_75cc3fda36c0aa28c6afd265b6da53c3.ufm old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_normal_0b05025fa87afc0a2692736d55437e3e.ufm rename to storage/fonts/roboto_normal_75cc3fda36c0aa28c6afd265b6da53c3.ufm diff --git a/storage/fonts/roboto_normal_0b05025fa87afc0a2692736d55437e3e.ufm.php b/storage/fonts/roboto_normal_75cc3fda36c0aa28c6afd265b6da53c3.ufm.php old mode 100644 new mode 100755 similarity index 100% rename from storage/fonts/roboto_normal_0b05025fa87afc0a2692736d55437e3e.ufm.php rename to storage/fonts/roboto_normal_75cc3fda36c0aa28c6afd265b6da53c3.ufm.php diff --git a/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ttf b/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ttf deleted file mode 100644 index a97385df..00000000 Binary files a/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ttf and /dev/null differ diff --git a/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ufm b/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ufm deleted file mode 100644 index 7c0be087..00000000 --- a/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ufm +++ /dev/null @@ -1,248 +0,0 @@ -StartFontMetrics 4.1 -Notice Converted by PHP-font-lib -Comment https://github.com/PhenX/php-font-lib -EncodingScheme FontSpecific -Copyright Copyright 2011 Google Inc. All Rights Reserved. -FontName Roboto -FontSubfamily Regular -UniqueID Roboto -FullName Roboto -Version Version 2.137; 2017 -PostScriptName Roboto-Regular -LicenseURL http://www.apache.org/licenses/LICENSE-2.0 -Weight Medium -ItalicAngle 0 -IsFixedPitch false -UnderlineThickness 49 -UnderlinePosition -73 -FontHeightOffset 0 -Ascender 928 -Descender -244 -FontBBox -737 -271 1148 1056 -StartCharMetrics 248 -U 0 ; WX 0 ; N uni0000 ; G 1 -U 13 ; WX 248 ; N uni000d ; G 3 -U 32 ; WX 248 ; N uni0020 ; G 4 -U 33 ; WX 257 ; N uni0021 ; G 5 -U 34 ; WX 320 ; N uni0022 ; G 6 -U 35 ; WX 616 ; N uni0023 ; G 7 -U 36 ; WX 562 ; N uni0024 ; G 8 -U 37 ; WX 732 ; N uni0025 ; G 9 -U 38 ; WX 622 ; N uni0026 ; G 10 -U 39 ; WX 174 ; N uni0027 ; G 11 -U 40 ; WX 342 ; N uni0028 ; G 12 -U 41 ; WX 348 ; N uni0029 ; G 13 -U 42 ; WX 431 ; N uni002a ; G 14 -U 43 ; WX 567 ; N uni002b ; G 15 -U 44 ; WX 196 ; N uni002c ; G 16 -U 45 ; WX 276 ; N uni002d ; G 17 -U 46 ; WX 263 ; N uni002e ; G 18 -U 47 ; WX 412 ; N uni002f ; G 19 -U 48 ; WX 562 ; N uni0030 ; G 20 -U 49 ; WX 562 ; N uni0031 ; G 21 -U 50 ; WX 562 ; N uni0032 ; G 22 -U 51 ; WX 562 ; N uni0033 ; G 23 -U 52 ; WX 562 ; N uni0034 ; G 24 -U 53 ; WX 562 ; N uni0035 ; G 25 -U 54 ; WX 562 ; N uni0036 ; G 26 -U 55 ; WX 562 ; N uni0037 ; G 27 -U 56 ; WX 562 ; N uni0038 ; G 28 -U 57 ; WX 562 ; N uni0039 ; G 29 -U 58 ; WX 242 ; N uni003a ; G 30 -U 59 ; WX 211 ; N uni003b ; G 31 -U 60 ; WX 508 ; N uni003c ; G 32 -U 61 ; WX 549 ; N uni003d ; G 33 -U 62 ; WX 522 ; N uni003e ; G 34 -U 63 ; WX 472 ; N uni003f ; G 35 -U 64 ; WX 898 ; N uni0040 ; G 36 -U 65 ; WX 652 ; N uni0041 ; G 37 -U 66 ; WX 623 ; N uni0042 ; G 38 -U 67 ; WX 651 ; N uni0043 ; G 39 -U 68 ; WX 656 ; N uni0044 ; G 40 -U 69 ; WX 568 ; N uni0045 ; G 41 -U 70 ; WX 553 ; N uni0046 ; G 42 -U 71 ; WX 681 ; N uni0047 ; G 43 -U 72 ; WX 713 ; N uni0048 ; G 44 -U 73 ; WX 272 ; N uni0049 ; G 45 -U 74 ; WX 552 ; N uni004a ; G 46 -U 75 ; WX 627 ; N uni004b ; G 47 -U 76 ; WX 538 ; N uni004c ; G 48 -U 77 ; WX 873 ; N uni004d ; G 49 -U 78 ; WX 713 ; N uni004e ; G 50 -U 79 ; WX 688 ; N uni004f ; G 51 -U 80 ; WX 631 ; N uni0050 ; G 52 -U 81 ; WX 688 ; N uni0051 ; G 53 -U 82 ; WX 616 ; N uni0052 ; G 54 -U 83 ; WX 593 ; N uni0053 ; G 55 -U 84 ; WX 597 ; N uni0054 ; G 56 -U 85 ; WX 648 ; N uni0055 ; G 57 -U 86 ; WX 636 ; N uni0056 ; G 58 -U 87 ; WX 887 ; N uni0057 ; G 59 -U 88 ; WX 627 ; N uni0058 ; G 60 -U 89 ; WX 601 ; N uni0059 ; G 61 -U 90 ; WX 599 ; N uni005a ; G 62 -U 91 ; WX 265 ; N uni005b ; G 63 -U 92 ; WX 410 ; N uni005c ; G 64 -U 93 ; WX 265 ; N uni005d ; G 65 -U 94 ; WX 418 ; N uni005e ; G 66 -U 95 ; WX 451 ; N uni005f ; G 67 -U 96 ; WX 309 ; N uni0060 ; G 68 -U 97 ; WX 544 ; N uni0061 ; G 69 -U 98 ; WX 561 ; N uni0062 ; G 70 -U 99 ; WX 523 ; N uni0063 ; G 71 -U 100 ; WX 564 ; N uni0064 ; G 72 -U 101 ; WX 530 ; N uni0065 ; G 73 -U 102 ; WX 347 ; N uni0066 ; G 74 -U 103 ; WX 561 ; N uni0067 ; G 75 -U 104 ; WX 551 ; N uni0068 ; G 76 -U 105 ; WX 243 ; N uni0069 ; G 77 -U 106 ; WX 239 ; N uni006a ; G 78 -U 107 ; WX 507 ; N uni006b ; G 79 -U 108 ; WX 243 ; N uni006c ; G 80 -U 109 ; WX 876 ; N uni006d ; G 81 -U 110 ; WX 552 ; N uni006e ; G 82 -U 111 ; WX 570 ; N uni006f ; G 83 -U 112 ; WX 561 ; N uni0070 ; G 84 -U 113 ; WX 568 ; N uni0071 ; G 85 -U 114 ; WX 338 ; N uni0072 ; G 86 -U 115 ; WX 516 ; N uni0073 ; G 87 -U 116 ; WX 327 ; N uni0074 ; G 88 -U 117 ; WX 551 ; N uni0075 ; G 89 -U 118 ; WX 484 ; N uni0076 ; G 90 -U 119 ; WX 751 ; N uni0077 ; G 91 -U 120 ; WX 496 ; N uni0078 ; G 92 -U 121 ; WX 473 ; N uni0079 ; G 93 -U 122 ; WX 496 ; N uni007a ; G 94 -U 123 ; WX 338 ; N uni007b ; G 95 -U 124 ; WX 244 ; N uni007c ; G 96 -U 125 ; WX 338 ; N uni007d ; G 97 -U 126 ; WX 680 ; N uni007e ; G 98 -U 160 ; WX 248 ; N uni00a0 ; G 189 -U 161 ; WX 244 ; N uni00a1 ; G 99 -U 162 ; WX 547 ; N uni00a2 ; G 100 -U 163 ; WX 581 ; N uni00a3 ; G 101 -U 164 ; WX 713 ; N uni00a4 ; G 102 -U 165 ; WX 525 ; N uni00a5 ; G 103 -U 166 ; WX 240 ; N uni00a6 ; G 104 -U 167 ; WX 613 ; N uni00a7 ; G 105 -U 168 ; WX 418 ; N uni00a8 ; G 106 -U 169 ; WX 786 ; N uni00a9 ; G 107 -U 170 ; WX 447 ; N uni00aa ; G 108 -U 171 ; WX 469 ; N uni00ab ; G 109 -U 172 ; WX 554 ; N uni00ac ; G 110 -U 173 ; WX 276 ; N uni00ad ; G 190 -U 174 ; WX 786 ; N uni00ae ; G 111 -U 175 ; WX 458 ; N uni00af ; G 112 -U 176 ; WX 374 ; N uni00b0 ; G 113 -U 177 ; WX 534 ; N uni00b1 ; G 114 -U 178 ; WX 367 ; N uni00b2 ; G 115 -U 179 ; WX 367 ; N uni00b3 ; G 116 -U 180 ; WX 313 ; N uni00b4 ; G 117 -U 181 ; WX 566 ; N uni00b5 ; G 118 -U 182 ; WX 489 ; N uni00b6 ; G 119 -U 183 ; WX 261 ; N uni00b7 ; G 120 -U 184 ; WX 248 ; N uni00b8 ; G 121 -U 185 ; WX 367 ; N uni00b9 ; G 122 -U 186 ; WX 455 ; N uni00ba ; G 123 -U 187 ; WX 469 ; N uni00bb ; G 124 -U 188 ; WX 732 ; N uni00bc ; G 125 -U 189 ; WX 776 ; N uni00bd ; G 126 -U 190 ; WX 778 ; N uni00be ; G 127 -U 191 ; WX 473 ; N uni00bf ; G 128 -U 192 ; WX 652 ; N uni00c0 ; G 192 -U 193 ; WX 652 ; N uni00c1 ; G 193 -U 194 ; WX 652 ; N uni00c2 ; G 194 -U 195 ; WX 652 ; N uni00c3 ; G 195 -U 196 ; WX 652 ; N uni00c4 ; G 196 -U 197 ; WX 652 ; N uni00c5 ; G 197 -U 198 ; WX 935 ; N uni00c6 ; G 129 -U 199 ; WX 651 ; N uni00c7 ; G 198 -U 200 ; WX 568 ; N uni00c8 ; G 199 -U 201 ; WX 568 ; N uni00c9 ; G 200 -U 202 ; WX 568 ; N uni00ca ; G 201 -U 203 ; WX 568 ; N uni00cb ; G 202 -U 204 ; WX 272 ; N uni00cc ; G 203 -U 205 ; WX 272 ; N uni00cd ; G 204 -U 206 ; WX 272 ; N uni00ce ; G 205 -U 207 ; WX 272 ; N uni00cf ; G 206 -U 208 ; WX 670 ; N uni00d0 ; G 191 -U 209 ; WX 713 ; N uni00d1 ; G 207 -U 210 ; WX 688 ; N uni00d2 ; G 208 -U 211 ; WX 688 ; N uni00d3 ; G 209 -U 212 ; WX 688 ; N uni00d4 ; G 210 -U 213 ; WX 688 ; N uni00d5 ; G 211 -U 214 ; WX 688 ; N uni00d6 ; G 212 -U 215 ; WX 533 ; N uni00d7 ; G 130 -U 216 ; WX 688 ; N uni00d8 ; G 131 -U 217 ; WX 648 ; N uni00d9 ; G 213 -U 218 ; WX 648 ; N uni00da ; G 214 -U 219 ; WX 648 ; N uni00db ; G 215 -U 220 ; WX 648 ; N uni00dc ; G 216 -U 221 ; WX 601 ; N uni00dd ; G 217 -U 222 ; WX 591 ; N uni00de ; G 132 -U 223 ; WX 595 ; N uni00df ; G 133 -U 224 ; WX 544 ; N uni00e0 ; G 218 -U 225 ; WX 544 ; N uni00e1 ; G 219 -U 226 ; WX 544 ; N uni00e2 ; G 220 -U 227 ; WX 544 ; N uni00e3 ; G 221 -U 228 ; WX 544 ; N uni00e4 ; G 222 -U 229 ; WX 544 ; N uni00e5 ; G 223 -U 230 ; WX 844 ; N uni00e6 ; G 134 -U 231 ; WX 523 ; N uni00e7 ; G 224 -U 232 ; WX 530 ; N uni00e8 ; G 225 -U 233 ; WX 530 ; N uni00e9 ; G 226 -U 234 ; WX 530 ; N uni00ea ; G 227 -U 235 ; WX 530 ; N uni00eb ; G 228 -U 236 ; WX 247 ; N uni00ec ; G 229 -U 237 ; WX 247 ; N uni00ed ; G 230 -U 238 ; WX 247 ; N uni00ee ; G 231 -U 239 ; WX 247 ; N uni00ef ; G 232 -U 240 ; WX 586 ; N uni00f0 ; G 135 -U 241 ; WX 552 ; N uni00f1 ; G 233 -U 242 ; WX 570 ; N uni00f2 ; G 234 -U 243 ; WX 570 ; N uni00f3 ; G 235 -U 244 ; WX 570 ; N uni00f4 ; G 236 -U 245 ; WX 570 ; N uni00f5 ; G 237 -U 246 ; WX 570 ; N uni00f6 ; G 238 -U 247 ; WX 571 ; N uni00f7 ; G 136 -U 248 ; WX 566 ; N uni00f8 ; G 137 -U 249 ; WX 551 ; N uni00f9 ; G 239 -U 250 ; WX 551 ; N uni00fa ; G 240 -U 251 ; WX 551 ; N uni00fb ; G 241 -U 252 ; WX 551 ; N uni00fc ; G 242 -U 253 ; WX 473 ; N uni00fd ; G 243 -U 254 ; WX 576 ; N uni00fe ; G 138 -U 255 ; WX 473 ; N uni00ff ; G 244 -U 305 ; WX 247 ; N uni0131 ; G 139 -U 338 ; WX 954 ; N uni0152 ; G 140 -U 339 ; WX 908 ; N uni0153 ; G 141 -U 700 ; WX 200 ; N uni02bc ; G 247 -U 710 ; WX 471 ; N uni02c6 ; G 142 -U 730 ; WX 334 ; N uni02da ; G 143 -U 732 ; WX 472 ; N uni02dc ; G 144 -U 8194 ; WX 510 ; N uni2002 ; G 145 -U 8201 ; WX 204 ; N uni2009 ; G 146 -U 8203 ; WX 0 ; N uni200b ; G 148 -U 8211 ; WX 656 ; N uni2013 ; G 149 -U 8212 ; WX 781 ; N uni2014 ; G 150 -U 8216 ; WX 200 ; N uni2018 ; G 151 -U 8217 ; WX 200 ; N uni2019 ; G 152 -U 8218 ; WX 199 ; N uni201a ; G 153 -U 8220 ; WX 354 ; N uni201c ; G 154 -U 8221 ; WX 357 ; N uni201d ; G 155 -U 8222 ; WX 344 ; N uni201e ; G 156 -U 8226 ; WX 337 ; N uni2022 ; G 157 -U 8230 ; WX 669 ; N uni2026 ; G 158 -U 8242 ; WX 174 ; N uni2032 ; G 245 -U 8243 ; WX 320 ; N uni2033 ; G 246 -U 8249 ; WX 300 ; N uni2039 ; G 159 -U 8250 ; WX 300 ; N uni203a ; G 160 -U 8260 ; WX 455 ; N uni2044 ; G 161 -U 8308 ; WX 367 ; N uni2074 ; G 162 -U 8364 ; WX 562 ; N uni20ac ; G 163 -U 8482 ; WX 625 ; N uni2122 ; G 164 -U 8722 ; WX 571 ; N uni2212 ; G 165 -U 65279 ; WX 0 ; N unifeff ; G 170 -U 65533 ; WX 1026 ; N unifffd ; G 171 -EndCharMetrics -EndFontMetrics diff --git a/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ufm.json b/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ufm.json deleted file mode 100644 index c92df764..00000000 --- a/storage/fonts/roboto_normal_db728720271025e5118179e1b242240f.ufm.json +++ /dev/null @@ -1,478 +0,0 @@ -{ - "codeToName": { - "0": "uni0000", - "13": "uni000d", - "32": "uni0020", - "33": "uni0021", - "34": "uni0022", - "35": "uni0023", - "36": "uni0024", - "37": "uni0025", - "38": "uni0026", - "39": "uni0027", - "40": "uni0028", - "41": "uni0029", - "42": "uni002a", - "43": "uni002b", - "44": "uni002c", - "45": "uni002d", - "46": "uni002e", - "47": "uni002f", - "48": "uni0030", - "49": "uni0031", - "50": "uni0032", - "51": "uni0033", - "52": "uni0034", - "53": "uni0035", - "54": "uni0036", - "55": "uni0037", - "56": "uni0038", - "57": "uni0039", - "58": "uni003a", - "59": "uni003b", - "60": "uni003c", - "61": "uni003d", - "62": "uni003e", - "63": "uni003f", - "64": "uni0040", - "65": "uni0041", - "66": "uni0042", - "67": "uni0043", - "68": "uni0044", - "69": "uni0045", - "70": "uni0046", - "71": "uni0047", - "72": "uni0048", - "73": "uni0049", - "74": "uni004a", - "75": "uni004b", - "76": "uni004c", - "77": "uni004d", - "78": "uni004e", - "79": "uni004f", - "80": "uni0050", - "81": "uni0051", - "82": "uni0052", - "83": "uni0053", - "84": "uni0054", - "85": "uni0055", - "86": "uni0056", - "87": "uni0057", - "88": "uni0058", - "89": "uni0059", - "90": "uni005a", - "91": "uni005b", - "92": "uni005c", - "93": "uni005d", - "94": "uni005e", - "95": "uni005f", - "96": "uni0060", - "97": "uni0061", - "98": "uni0062", - "99": "uni0063", - "100": "uni0064", - "101": "uni0065", - "102": "uni0066", - "103": "uni0067", - "104": "uni0068", - "105": "uni0069", - "106": "uni006a", - "107": "uni006b", - "108": "uni006c", - "109": "uni006d", - "110": "uni006e", - "111": "uni006f", - "112": "uni0070", - "113": "uni0071", - "114": "uni0072", - "115": "uni0073", - "116": "uni0074", - "117": "uni0075", - "118": "uni0076", - "119": "uni0077", - "120": "uni0078", - "121": "uni0079", - "122": "uni007a", - "123": "uni007b", - "124": "uni007c", - "125": "uni007d", - "126": "uni007e", - "160": "uni00a0", - "161": "uni00a1", - "162": "uni00a2", - "163": "uni00a3", - "164": "uni00a4", - "165": "uni00a5", - "166": "uni00a6", - "167": "uni00a7", - "168": "uni00a8", - "169": "uni00a9", - "170": "uni00aa", - "171": "uni00ab", - "172": "uni00ac", - "173": "uni00ad", - "174": "uni00ae", - "175": "uni00af", - "176": "uni00b0", - "177": "uni00b1", - "178": "uni00b2", - "179": "uni00b3", - "180": "uni00b4", - "181": "uni00b5", - "182": "uni00b6", - "183": "uni00b7", - "184": "uni00b8", - "185": "uni00b9", - "186": "uni00ba", - "187": "uni00bb", - "188": "uni00bc", - "189": "uni00bd", - "190": "uni00be", - "191": "uni00bf", - "192": "uni00c0", - "193": "uni00c1", - "194": "uni00c2", - "195": "uni00c3", - "196": "uni00c4", - "197": "uni00c5", - "198": "uni00c6", - "199": "uni00c7", - "200": "uni00c8", - "201": "uni00c9", - "202": "uni00ca", - "203": "uni00cb", - "204": "uni00cc", - "205": "uni00cd", - "206": "uni00ce", - "207": "uni00cf", - "208": "uni00d0", - "209": "uni00d1", - "210": "uni00d2", - "211": "uni00d3", - "212": "uni00d4", - "213": "uni00d5", - "214": "uni00d6", - "215": "uni00d7", - "216": "uni00d8", - "217": "uni00d9", - "218": "uni00da", - "219": "uni00db", - "220": "uni00dc", - "221": "uni00dd", - "222": "uni00de", - "223": "uni00df", - "224": "uni00e0", - "225": "uni00e1", - "226": "uni00e2", - "227": "uni00e3", - "228": "uni00e4", - "229": "uni00e5", - "230": "uni00e6", - "231": "uni00e7", - "232": "uni00e8", - "233": "uni00e9", - "234": "uni00ea", - "235": "uni00eb", - "236": "uni00ec", - "237": "uni00ed", - "238": "uni00ee", - "239": "uni00ef", - "240": "uni00f0", - "241": "uni00f1", - "242": "uni00f2", - "243": "uni00f3", - "244": "uni00f4", - "245": "uni00f5", - "246": "uni00f6", - "247": "uni00f7", - "248": "uni00f8", - "249": "uni00f9", - "250": "uni00fa", - "251": "uni00fb", - "252": "uni00fc", - "253": "uni00fd", - "254": "uni00fe", - "255": "uni00ff", - "305": "uni0131", - "338": "uni0152", - "339": "uni0153", - "700": "uni02bc", - "710": "uni02c6", - "730": "uni02da", - "732": "uni02dc", - "8194": "uni2002", - "8201": "uni2009", - "8203": "uni200b", - "8211": "uni2013", - "8212": "uni2014", - "8216": "uni2018", - "8217": "uni2019", - "8218": "uni201a", - "8220": "uni201c", - "8221": "uni201d", - "8222": "uni201e", - "8226": "uni2022", - "8230": "uni2026", - "8242": "uni2032", - "8243": "uni2033", - "8249": "uni2039", - "8250": "uni203a", - "8260": "uni2044", - "8308": "uni2074", - "8364": "uni20ac", - "8482": "uni2122", - "8722": "uni2212", - "65279": "unifeff", - "65533": "unifffd" - }, - "isUnicode": true, - "EncodingScheme": "FontSpecific", - "FontName": "Roboto", - "FullName": "Roboto", - "Version": "Version 2.137; 2017", - "PostScriptName": "Roboto-Regular", - "Weight": "Medium", - "ItalicAngle": "0", - "IsFixedPitch": "false", - "UnderlineThickness": "49", - "UnderlinePosition": "-73", - "FontHeightOffset": "0", - "Ascender": "928", - "Descender": "-244", - "FontBBox": [ - "-737", - "-271", - "1148", - "1056" - ], - "StartCharMetrics": "248", - "C": { - "0": 0, - "13": 248, - "32": 248, - "33": 257, - "34": 320, - "35": 616, - "36": 562, - "37": 732, - "38": 622, - "39": 174, - "40": 342, - "41": 348, - "42": 431, - "43": 567, - "44": 196, - "45": 276, - "46": 263, - "47": 412, - "48": 562, - "49": 562, - "50": 562, - "51": 562, - "52": 562, - "53": 562, - "54": 562, - "55": 562, - "56": 562, - "57": 562, - "58": 242, - "59": 211, - "60": 508, - "61": 549, - "62": 522, - "63": 472, - "64": 898, - "65": 652, - "66": 623, - "67": 651, - "68": 656, - "69": 568, - "70": 553, - "71": 681, - "72": 713, - "73": 272, - "74": 552, - "75": 627, - "76": 538, - "77": 873, - "78": 713, - "79": 688, - "80": 631, - "81": 688, - "82": 616, - "83": 593, - "84": 597, - "85": 648, - "86": 636, - "87": 887, - "88": 627, - "89": 601, - "90": 599, - "91": 265, - "92": 410, - "93": 265, - "94": 418, - "95": 451, - "96": 309, - "97": 544, - "98": 561, - "99": 523, - "100": 564, - "101": 530, - "102": 347, - "103": 561, - "104": 551, - "105": 243, - "106": 239, - "107": 507, - "108": 243, - "109": 876, - "110": 552, - "111": 570, - "112": 561, - "113": 568, - "114": 338, - "115": 516, - "116": 327, - "117": 551, - "118": 484, - "119": 751, - "120": 496, - "121": 473, - "122": 496, - "123": 338, - "124": 244, - "125": 338, - "126": 680, - "160": 248, - "161": 244, - "162": 547, - "163": 581, - "164": 713, - "165": 525, - "166": 240, - "167": 613, - "168": 418, - "169": 786, - "170": 447, - "171": 469, - "172": 554, - "173": 276, - "174": 786, - "175": 458, - "176": 374, - "177": 534, - "178": 367, - "179": 367, - "180": 313, - "181": 566, - "182": 489, - "183": 261, - "184": 248, - "185": 367, - "186": 455, - "187": 469, - "188": 732, - "189": 776, - "190": 778, - "191": 473, - "192": 652, - "193": 652, - "194": 652, - "195": 652, - "196": 652, - "197": 652, - "198": 935, - "199": 651, - "200": 568, - "201": 568, - "202": 568, - "203": 568, - "204": 272, - "205": 272, - "206": 272, - "207": 272, - "208": 670, - "209": 713, - "210": 688, - "211": 688, - "212": 688, - "213": 688, - "214": 688, - "215": 533, - "216": 688, - "217": 648, - "218": 648, - "219": 648, - "220": 648, - "221": 601, - "222": 591, - "223": 595, - "224": 544, - "225": 544, - "226": 544, - "227": 544, - "228": 544, - "229": 544, - "230": 844, - "231": 523, - "232": 530, - "233": 530, - "234": 530, - "235": 530, - "236": 247, - "237": 247, - "238": 247, - "239": 247, - "240": 586, - "241": 552, - "242": 570, - "243": 570, - "244": 570, - "245": 570, - "246": 570, - "247": 571, - "248": 566, - "249": 551, - "250": 551, - "251": 551, - "252": 551, - "253": 473, - "254": 576, - "255": 473, - "305": 247, - "338": 954, - "339": 908, - "700": 200, - "710": 471, - "730": 334, - "732": 472, - "8194": 510, - "8201": 204, - "8203": 0, - "8211": 656, - "8212": 781, - "8216": 200, - "8217": 200, - "8218": 199, - "8220": 354, - "8221": 357, - "8222": 344, - "8226": 337, - "8230": 669, - "8242": 174, - "8243": 320, - "8249": 300, - "8250": 300, - "8260": 455, - "8308": 367, - "8364": 562, - "8482": 625, - "8722": 571, - "65279": 0, - "65533": 1026 - }, - "CIDtoGID_Compressed": true, - "CIDtoGID": "eJzt0FPPYGcYhtGrqW3btm3btm3bZmrzpP0NtW3btk47TeZgOplpJ+1MvyZdK3n362ffezdawzP6cHeGNEZjNlZjN07jNl7jN0ETNlETN0mTNlmTN0VTNlVTN03TNl3TN0MzNlMzN0uzNluzN0dzNldzN0\/zNl\/zt0ALtlALt0iLtliLt0RLtlRLt0zLtlzLt0IrtlIrt0qrtlqrt0ZrtlZrt07rtl7rt0EbtlEbt0mbtlmbt0VbtlVbt03btl3bt0M7tlM7t0u7ttsIfeGfu7vd26M926u926d926\/9O6ADO6h7OrhDOrTDOrwjOrKjOrpjOrbjOr4TOrGTOrlTuq\/7e6AHe6iHO7VHerTHerwnerKnerpnurdne67ne6EXe6nTOr2Xe6VXe63XO6Mze6M3e6u3e6d3O6v3er8P+rCP+rhP+rTPOrvP+6Iv+6qv+6ZzOrdv+67v+6EfO6+fRsIf+Cvn\/+MKF3ThSMgB\/x2\/DmPtohG8e\/GgdsnIiwIAAAAAAAAAAAAAAAAAwH\/MpX+YXTaoXT7UiSu6cvDoqq7umkH9tV3X9YPXbhjc3zic+j\/3yxCzm7p5GGduGeG0f8+to7j+0G77l983kG4f6ACMUncMdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\/mfuHOgADJi7fn\/8Bsu+aH4=", - "_version_": 6 -} \ No newline at end of file