shipping costs
This commit is contained in:
Kevin Adametz
parent
d4f6a774d0
commit
22a2b4710a
20 changed files with 797 additions and 457 deletions
639
.idea/workspace.xml
generated
639
.idea/workspace.xml
generated
|
|
@ -2,49 +2,25 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Controllers/ShippingController.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/Http/Middleware/Subdomain.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/web/start.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/layout.blade.php" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/routes/_web.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/KasController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/KasController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ShippingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ShippingController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Http/Kernel.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Kernel.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Product.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Product.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/Shipping.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Shipping.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShippingCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShippingCountry.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/ShippingPrice.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShippingPrice.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Models/UserShop.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserShop.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/HTMLHelper.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/HTMLHelper.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/Services/Yard.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Yard.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/lang/de.json" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/de.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/home.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/home.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/application.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/layouts/includes/header.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/layouts/includes/header.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/aloevera.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/aloevera.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/anforderungsprofil.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/anforderungsprofil.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/admin/users.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/users.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout-final.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/datenschutz.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/datenschutz.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/erreichbarkeit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/erreichbarkeit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/existenzgruendung.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/existenzgruendung.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/impressum.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/impressum.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/karrierechancen.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/karrierechancen.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/kontakt.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/kontakt.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/partner.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/partner.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/produkte.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/produkte.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/ueber-uns.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/ueber-uns.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/vereinbarkeit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/vereinbarkeit.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/templates/vorteile.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/vorteile.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/resources/views/web/user/start.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/start.blade.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
|
|
@ -61,15 +37,15 @@
|
|||
<session id="396433632">
|
||||
<usages-collector id="statistics.lifecycle.project">
|
||||
<counts>
|
||||
<entry key="project.closed" value="17" />
|
||||
<entry key="project.closed" value="18" />
|
||||
<entry key="project.open.time.0" value="6" />
|
||||
<entry key="project.open.time.1" value="1" />
|
||||
<entry key="project.open.time.2" value="1" />
|
||||
<entry key="project.open.time.3" value="2" />
|
||||
<entry key="project.open.time.4" value="3" />
|
||||
<entry key="project.open.time.4" value="4" />
|
||||
<entry key="project.open.time.5" value="3" />
|
||||
<entry key="project.open.time.8" value="1" />
|
||||
<entry key="project.opened" value="17" />
|
||||
<entry key="project.opened" value="18" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.extensions.open">
|
||||
|
|
@ -79,9 +55,9 @@
|
|||
<entry key="htaccess" value="2" />
|
||||
<entry key="jpg" value="2" />
|
||||
<entry key="js" value="8" />
|
||||
<entry key="json" value="11" />
|
||||
<entry key="json" value="12" />
|
||||
<entry key="less" value="1" />
|
||||
<entry key="php" value="834" />
|
||||
<entry key="php" value="874" />
|
||||
<entry key="png" value="1" />
|
||||
<entry key="scss" value="19" />
|
||||
</counts>
|
||||
|
|
@ -89,13 +65,13 @@
|
|||
<usages-collector id="statistics.file.types.open">
|
||||
<counts>
|
||||
<entry key=".env file" value="7" />
|
||||
<entry key="Blade" value="287" />
|
||||
<entry key="Blade" value="300" />
|
||||
<entry key="CSS" value="2" />
|
||||
<entry key="Image" value="3" />
|
||||
<entry key="JSON" value="11" />
|
||||
<entry key="JSON" value="12" />
|
||||
<entry key="JavaScript" value="8" />
|
||||
<entry key="Less" value="1" />
|
||||
<entry key="PHP" value="547" />
|
||||
<entry key="PHP" value="574" />
|
||||
<entry key="SCSS" value="19" />
|
||||
<entry key="htaccess" value="2" />
|
||||
</counts>
|
||||
|
|
@ -106,8 +82,8 @@
|
|||
<entry key="dummy" value="48" />
|
||||
<entry key="env" value="61" />
|
||||
<entry key="js" value="6" />
|
||||
<entry key="json" value="1114" />
|
||||
<entry key="php" value="19316" />
|
||||
<entry key="json" value="1115" />
|
||||
<entry key="php" value="21712" />
|
||||
<entry key="scss" value="2" />
|
||||
<entry key="txt" value="770" />
|
||||
</counts>
|
||||
|
|
@ -115,11 +91,11 @@
|
|||
<usages-collector id="statistics.file.types.edit">
|
||||
<counts>
|
||||
<entry key=".env file" value="61" />
|
||||
<entry key="Blade" value="8414" />
|
||||
<entry key="Blade" value="9572" />
|
||||
<entry key="CSS" value="11" />
|
||||
<entry key="JSON" value="1114" />
|
||||
<entry key="JSON" value="1115" />
|
||||
<entry key="JavaScript" value="6" />
|
||||
<entry key="PHP" value="10902" />
|
||||
<entry key="PHP" value="12140" />
|
||||
<entry key="PLAIN_TEXT" value="818" />
|
||||
<entry key="SCSS" value="2" />
|
||||
</counts>
|
||||
|
|
@ -139,78 +115,10 @@
|
|||
</session>
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/routes/web.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="980">
|
||||
<caret line="201" selection-start-line="201" selection-end-line="201" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004815_create_shippings_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="462">
|
||||
<caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/Shipping.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="700">
|
||||
<caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ShippingController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="914">
|
||||
<caret line="81" column="40" lean-forward="true" selection-start-line="81" selection-start-column="40" selection-end-line="81" selection-end-column="40" />
|
||||
<folding>
|
||||
<element signature="e#43#67#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="546">
|
||||
<caret line="39" column="10" lean-forward="true" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
|
||||
<folding>
|
||||
<element signature="e#354#378#0#HTML" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="588">
|
||||
<caret line="42" column="77" lean-forward="true" selection-start-line="42" selection-start-column="77" selection-end-line="42" selection-end-column="77" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
|
||||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>yout</find>
|
||||
<find>tem</find>
|
||||
<find>?></find>
|
||||
<find>exca</find>
|
||||
<find>tax</find>
|
||||
|
|
@ -239,6 +147,8 @@
|
|||
<find>ac</find>
|
||||
<find>card_show</find>
|
||||
<find>route</find>
|
||||
<find>$(this).find(".modal-body select[name='factor']").val(button.data('factor'));</find>
|
||||
<find>dele</find>
|
||||
</findStrings>
|
||||
</component>
|
||||
<component name="FrameworkCommandLineHistory">
|
||||
|
|
@ -276,15 +186,6 @@
|
|||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/app/Services/Slim.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/home.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/lang/de.json" />
|
||||
<option value="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/Api/KasController.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/UserShop.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/layouts/application.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Kernel.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/user.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/user/layouts/layout.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/user/index.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" />
|
||||
|
|
@ -306,27 +207,36 @@
|
|||
<option value="$PROJECT_DIR$/resources/views/web/start.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/index.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Middleware/Subdomain.php" />
|
||||
<option value="$PROJECT_DIR$/app/Services/Util.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/layouts/includes/header.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/templates/produkte.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php" />
|
||||
<option value="$PROJECT_DIR$/database/migrations/2019_01_06_004815_create_shippings_table.php" />
|
||||
<option value="$PROJECT_DIR$/database/migrations/2019_01_06_004907_create_shipping_countries_table.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/ShippingCountry.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/ShippingPrice.php" />
|
||||
<option value="$PROJECT_DIR$/database/migrations/2019_01_06_004849_create_shipping_prices_table.php" />
|
||||
<option value="$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" />
|
||||
<option value="$PROJECT_DIR$/routes/web.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/Shipping.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/ShippingPrice.php" />
|
||||
<option value="$PROJECT_DIR$/routes/web.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/ShippingCountry.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/ShippingController.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/Shipping.php" />
|
||||
<option value="$PROJECT_DIR$/resources/lang/de.json" />
|
||||
<option value="$PROJECT_DIR$/resources/views/admin/users.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/UserShop.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/DataTableController.php" />
|
||||
<option value="$PROJECT_DIR$/app/Models/Product.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/user/start.blade.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Services/Yard.php" />
|
||||
<option value="$PROJECT_DIR$/app/Services/HTMLHelper.php" />
|
||||
<option value="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" />
|
||||
<option value="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -578,6 +488,12 @@
|
|||
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="lang" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="mivita.care" type="462c0819:PsiDirectoryNode" />
|
||||
|
|
@ -790,17 +706,17 @@
|
|||
<workItem from="1544829993268" duration="5406000" />
|
||||
<workItem from="1546523595056" duration="30055000" />
|
||||
<workItem from="1546704135920" duration="19864000" />
|
||||
<workItem from="1546806383318" duration="9637000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="135963000" />
|
||||
<option name="totallyTimeSpent" value="145600000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="22" y="23" width="2546" height="1417" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49887386" visible="true" weight="0.20127796" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49887386" visible="true" weight="0.2028754" />
|
||||
<window_info id="Structure" order="1" sideWeight="0.5011261" side_tool="true" weight="0.25599042" />
|
||||
<window_info id="Favorites" order="2" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
|
|
@ -841,138 +757,6 @@
|
|||
</breakpoint-manager>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/_bcategories.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="448">
|
||||
<caret line="32" selection-start-line="32" selection-end-line="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/UserSiteController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="266">
|
||||
<caret line="23" column="25" lean-forward="true" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/start.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="3220">
|
||||
<caret line="230" selection-start-line="230" selection-end-line="230" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="14">
|
||||
<caret line="1" selection-start-line="1" selection-end-line="1" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/lang/de.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="481">
|
||||
<caret line="150" column="21" selection-start-line="150" selection-start-column="21" selection-end-line="150" selection-end-column="21" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/routes/_web.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="350">
|
||||
<caret line="34" column="64" lean-forward="true" selection-start-line="34" selection-start-column="64" selection-end-line="34" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/home.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1797">
|
||||
<caret line="130" selection-start-line="130" selection-end-line="130" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="760">
|
||||
<caret line="68" column="50" selection-start-line="68" selection-start-column="50" selection-end-line="68" selection-end-column="50" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="718">
|
||||
<caret line="74" column="9" selection-start-line="74" selection-start-column="9" selection-end-line="74" selection-end-column="9" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/user/start.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="364">
|
||||
<caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="51" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Middleware/Subdomain.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="490">
|
||||
<caret line="35" selection-start-line="35" selection-end-line="35" />
|
||||
<folding>
|
||||
<element signature="e#39#63#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1068">
|
||||
<caret line="88" column="56" selection-start-line="88" selection-start-column="56" selection-end-line="88" selection-end-column="56" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Services/Util.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="658">
|
||||
<caret line="47" column="35" selection-start-line="47" selection-start-column="27" selection-end-line="47" selection-end-column="35" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2018_10_21_164003_create_product_attributes_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/layouts/includes/header.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="262">
|
||||
<caret line="61" column="64" selection-start-line="61" selection-start-column="64" selection-end-line="61" selection-end-column="64" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="547">
|
||||
<caret line="157" column="37" selection-start-line="157" selection-start-column="37" selection-end-line="157" selection-end-column="37" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/produkte.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="767">
|
||||
<caret line="107" column="91" selection-start-line="107" selection-start-column="91" selection-end-line="107" selection-end-column="106" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="94">
|
||||
<caret line="80" column="34" selection-start-line="80" selection-start-column="34" selection-end-line="80" selection-end-column="34" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/card.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="345">
|
||||
<caret line="122" column="55" selection-start-line="122" selection-start-column="55" selection-end-line="122" selection-end-column="76" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="523">
|
||||
|
|
@ -987,13 +771,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2018_09_29_145909_create_countries_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="182">
|
||||
<caret line="15" column="33" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="33" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2019_01_03_162833_create_user_shops_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="252">
|
||||
|
|
@ -1018,27 +795,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/Country.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="560">
|
||||
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/ShippingCountry.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="350">
|
||||
<caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/Product.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="586">
|
||||
<caret line="141" column="2" lean-forward="true" selection-start-line="141" selection-start-column="2" selection-end-line="192" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004907_create_shipping_countries_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="518">
|
||||
|
|
@ -1067,13 +823,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/product/form.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="630">
|
||||
<caret line="45" column="28" lean-forward="true" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/layouts/includes/layout-navbar.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
|
|
@ -1094,15 +843,9 @@
|
|||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="602">
|
||||
<caret line="43" column="10" lean-forward="true" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1081">
|
||||
|
|
@ -1110,25 +853,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/routes/web.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="980">
|
||||
<caret line="201" selection-start-line="201" selection-end-line="201" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/user/form.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1399" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/ShippingPrice.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="712">
|
||||
<caret line="57" column="5" lean-forward="true" selection-start-line="51" selection-start-column="3" selection-end-line="57" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserShopController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="644">
|
||||
|
|
@ -1136,10 +860,171 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="574">
|
||||
<caret line="41" column="55" lean-forward="true" selection-start-line="41" selection-start-column="55" selection-end-line="41" selection-end-column="55" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/UserDataController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="522">
|
||||
<caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004815_create_shippings_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="224">
|
||||
<caret line="18" column="44" lean-forward="true" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2018_09_29_145909_create_countries_table.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="392">
|
||||
<caret line="30" column="6" lean-forward="true" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/attribute/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="265">
|
||||
<caret line="43" column="79" selection-start-line="43" selection-start-column="79" selection-end-line="43" selection-end-column="79" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/category/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="932">
|
||||
<caret line="100" column="24" lean-forward="true" selection-start-line="100" selection-start-column="24" selection-end-line="100" selection-end-column="24" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Services/Util.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="658">
|
||||
<caret line="47" column="35" selection-start-line="47" selection-start-column="27" selection-end-line="47" selection-end-column="35" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/shipping/edit.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="588">
|
||||
<caret line="42" column="77" lean-forward="true" selection-start-line="42" selection-start-column="77" selection-end-line="42" selection-end-column="77" />
|
||||
<state relative-caret-position="88">
|
||||
<caret line="182" column="53" lean-forward="true" selection-start-line="182" selection-start-column="53" selection-end-line="182" selection-end-column="53" />
|
||||
<folding>
|
||||
<element signature="e#804#2446#0#HTML" />
|
||||
<element signature="e#1835#1865#0#HTML" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="84">
|
||||
<caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ShippingController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="87">
|
||||
<caret line="41" column="14" lean-forward="true" selection-start-line="41" selection-start-column="14" selection-end-line="41" selection-end-column="14" />
|
||||
<folding>
|
||||
<element signature="e#43#67#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="84">
|
||||
<caret line="12" column="14" lean-forward="true" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/routes/web.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="390">
|
||||
<caret line="159" column="29" lean-forward="true" selection-start-line="159" selection-start-column="29" selection-end-line="159" selection-end-column="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/user/form.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1092">
|
||||
<caret line="98" lean-forward="true" selection-start-line="98" selection-end-line="98" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/lang/de.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="678">
|
||||
<caret line="163" column="27" lean-forward="true" selection-start-line="163" selection-start-column="27" selection-end-line="163" selection-end-column="27" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/users.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="760">
|
||||
<caret line="94" column="87" selection-start-line="94" selection-start-column="87" selection-end-line="94" selection-end-column="87" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/UserShop.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="670">
|
||||
<caret line="58" column="5" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/DataTableController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="798">
|
||||
<caret line="59" column="59" selection-start-line="59" selection-start-column="59" selection-end-line="59" selection-end-column="59" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/Product.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="595">
|
||||
<caret line="118" selection-start-line="118" selection-end-line="118" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/kontakt.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="224">
|
||||
<caret line="16" column="22" lean-forward="true" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/Country.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="672">
|
||||
<caret line="49" column="29" lean-forward="true" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Providers/YardServiceProvider.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="392">
|
||||
<caret line="29" column="1" lean-forward="true" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/_ide_helper.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1048">
|
||||
<caret line="20407" column="10" selection-start-line="20407" selection-start-column="10" selection-end-line="20407" selection-end-column="10" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/ShippingCountry.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="364">
|
||||
<caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -1150,35 +1035,77 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004815_create_shippings_table.php">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="462">
|
||||
<caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
|
||||
<state relative-caret-position="419">
|
||||
<caret line="123" column="34" lean-forward="true" selection-start-line="123" selection-start-column="34" selection-end-line="123" selection-end-column="34" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/AdminUserController.php">
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/user/start.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="376">
|
||||
<caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Repositories/ProductRepository.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="553">
|
||||
<caret line="42" selection-start-line="42" selection-end-line="42" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/product/form.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="678">
|
||||
<caret line="80" column="18" selection-start-line="80" selection-start-column="18" selection-end-line="80" selection-end-column="18" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/web/templates/card.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="796">
|
||||
<caret line="209" lean-forward="true" selection-start-line="197" selection-start-column="31" selection-end-line="209" />
|
||||
<folding>
|
||||
<element signature="e#8179#8204#0#HTML" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Services/HTMLHelper.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="247">
|
||||
<caret line="157" column="31" lean-forward="true" selection-start-line="157" selection-start-column="31" selection-end-line="157" selection-end-column="31" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Services/Yard.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="362">
|
||||
<caret line="41" column="81" selection-start-line="41" selection-start-column="81" selection-end-line="41" selection-end-column="81" />
|
||||
<folding>
|
||||
<element signature="e#31#62#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Models/ShippingPrice.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="266">
|
||||
<caret line="19" selection-start-line="19" selection-end-line="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="844">
|
||||
<caret line="95" column="74" selection-start-line="95" selection-start-column="74" selection-end-line="95" selection-end-column="74" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Services/Slim.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ShippingController.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="914">
|
||||
<caret line="81" column="40" lean-forward="true" selection-start-line="81" selection-start-column="40" selection-end-line="81" selection-end-column="40" />
|
||||
<folding>
|
||||
<element signature="e#43#67#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/resources/views/admin/shipping/index.blade.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="546">
|
||||
<caret line="39" column="10" lean-forward="true" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
|
||||
<folding>
|
||||
<element signature="e#354#378#0#HTML" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -50,8 +50,14 @@ class DataTableController extends Controller
|
|||
$query = User::where('deleted_at', '=', null);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('first_name', function (User $user) {
|
||||
return $user->account ? $user->account->first_name : '';
|
||||
})
|
||||
->addColumn('last_name', function (User $user) {
|
||||
return $user->account ? $user->account->last_name : '';
|
||||
})
|
||||
->addColumn('action_edit', function (User $user) {
|
||||
return '<a href="' . route('admin_user_edit', [$user->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
|
||||
return '<a href="' . route('admin_lead_edit', [$user->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
|
||||
})
|
||||
->addColumn('admin', function (User $user) {
|
||||
return '<a href="#" data-toggle="modal" data-target="#modals-default" data-id="'.$user->id.'" data-email="'.$user->email.'" data-admin="'.$user->admin.'" data-active="'.$user->active.'" data-confirmed="'.$user->confirmed.'">'.HTMLHelper::getRoleLabel($user->admin).'</a>';
|
||||
|
|
@ -62,13 +68,24 @@ class DataTableController extends Controller
|
|||
->addColumn('active', function (User $user) {
|
||||
return $user->active ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
})
|
||||
->addColumn('shop', function (User $user) {
|
||||
if($user->shop){
|
||||
if($user->shop->active){
|
||||
return '<span class="badge badge-pill badge-success"><i class="far fa-check"></i> active</span>'.$user->shop->getActiveDateFormatSmall();
|
||||
}else{
|
||||
return'<span class="badge badge-pill badge-success"><i class="far fa-check"></i> deactive</span>'.$user->shop->getActiveDateFormatSmall();
|
||||
}
|
||||
}
|
||||
return '<span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
|
||||
})
|
||||
->addColumn('action_delete', function (User $user) {
|
||||
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>';
|
||||
})
|
||||
->orderColumn('confirmed', 'confirmed $1')
|
||||
->orderColumn('active', 'active $1')
|
||||
->orderColumn('shop', 'shop $1')
|
||||
->orderColumn('admin', 'active $1')
|
||||
->rawColumns(['action_edit', 'admin', 'confirmed', 'active', 'action_delete'])
|
||||
->rawColumns(['action_edit', 'admin', 'confirmed', 'active', 'shop', 'action_delete'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ namespace App\Http\Controllers;
|
|||
|
||||
|
||||
use App\Models\Shipping;
|
||||
use App\Models\ShippingCountry;
|
||||
use App\Models\ShippingPrice;
|
||||
use Input;
|
||||
use Illuminate\Http\Request;
|
||||
use Validator;
|
||||
|
|
@ -55,50 +57,94 @@ class ShippingController extends Controller
|
|||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$data = Input::all();
|
||||
if ($data['id'] == "new") {
|
||||
$shipping = new Shipping();
|
||||
$rules = array(
|
||||
'name' => 'required',
|
||||
);
|
||||
|
||||
} else {
|
||||
$shipping = Shipping::findOrFail($data['id']);
|
||||
$rules = array(
|
||||
'name' => 'required',
|
||||
);
|
||||
}
|
||||
$data = [
|
||||
'value' => $shipping,
|
||||
];
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return view('admin.shipping.edit', $data)->withErrors($validator);
|
||||
|
||||
}
|
||||
$shipping = false;
|
||||
$data = Input::all();
|
||||
|
||||
$shipping->name = $data['name'];
|
||||
$shipping->free = $data['free'];
|
||||
$shipping->active = isset($data['active']) ? true : false;
|
||||
$shipping->save();
|
||||
if($data['action'] == 'shipping'){
|
||||
if ($data['id'] == "new") {
|
||||
$shipping = new Shipping();
|
||||
$rules = array('name' => 'required');
|
||||
} else {
|
||||
$shipping = Shipping::findOrFail($data['id']);
|
||||
$rules = array('name' => 'required');
|
||||
}
|
||||
$ret = ['value' => $shipping];
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return view('admin.shipping.edit', $ret)->withErrors($validator);
|
||||
}
|
||||
$data = Input::all();
|
||||
$shipping->name = $data['name'];
|
||||
$shipping->free = $data['free'];
|
||||
$shipping->active = isset($data['active']) ? true : false;
|
||||
$shipping->save();
|
||||
}
|
||||
|
||||
if($data['action'] == 'price'){
|
||||
$shipping = Shipping::findOrFail($data['shipping_id']);
|
||||
$rules = array('price' => 'required');
|
||||
$ret = ['value' => $shipping];
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
if ($validator->fails()) {
|
||||
return view('admin.shipping.edit', $ret)->withErrors($validator);
|
||||
}
|
||||
if ($data['id'] == "new") {
|
||||
$price = ShippingPrice::create($data);
|
||||
} else {
|
||||
$price = ShippingPrice::findOrFail($data['id']);
|
||||
if($price->shipping_id != $shipping->id){
|
||||
abort(404);
|
||||
}
|
||||
$price->fill($data);
|
||||
$price->save();
|
||||
}
|
||||
|
||||
\Session()->flash('alert-save', true);
|
||||
}
|
||||
if($data['action'] == 'country'){
|
||||
$shipping = Shipping::findOrFail($data['shipping_id']);
|
||||
foreach($data['country_ids'] as $country_id){
|
||||
if(ShippingCountry::where('country_id', $country_id)->count() == 0){
|
||||
ShippingCountry::create([
|
||||
'shipping_id' => $shipping->id,
|
||||
'country_id' => $country_id
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return redirect(route('admin_shipping_edit', [$shipping->id]));
|
||||
if($shipping){
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect(route('admin_shipping_edit', [$shipping->id]));
|
||||
}
|
||||
return redirect(route('admin_shippings'));
|
||||
|
||||
}
|
||||
|
||||
public function deleteShipping($shipping_id)
|
||||
{
|
||||
$shipping = Shipping::findOrFail($shipping_id);
|
||||
$shipping->delete();
|
||||
|
||||
public function deleteShipping($id)
|
||||
{
|
||||
$model = Shipping::findOrFail($id);
|
||||
$model->delete();
|
||||
\Session()->flash('alert-success', "Versandkosten gelöscht");
|
||||
return redirect('/admin/shippings');
|
||||
}
|
||||
|
||||
public function deletePrice($id)
|
||||
{
|
||||
$model = ShippingPrice::findOrFail($id);
|
||||
$shipping = $model->shipping;
|
||||
$model->delete();
|
||||
\Session()->flash('alert-success', "Preis gelöscht");
|
||||
return redirect(route('admin_shipping_edit', [$shipping->id]));
|
||||
}
|
||||
|
||||
public function deleteCountry($id)
|
||||
{
|
||||
$model = ShippingCountry::findOrFail($id);
|
||||
$shipping = $model->shipping;
|
||||
$model->delete();
|
||||
\Session()->flash('alert-success', "Preis gelöscht");
|
||||
return redirect(route('admin_shipping_edit', [$shipping->id]));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@ namespace App\Http\Controllers\Web;
|
|||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Product;
|
||||
use App\Models\ShippingCountry;
|
||||
use Util;
|
||||
use Yard;
|
||||
use Input;
|
||||
|
|
@ -57,6 +58,15 @@ class CardController extends Controller
|
|||
}
|
||||
|
||||
public function showCard(){
|
||||
|
||||
if(Input::get('selected_country')){
|
||||
$selected_country = Input::get('selected_country');
|
||||
}else{
|
||||
$ShippingCountry = ShippingCountry::where('country_id', 1)->first();
|
||||
$selected_country = $ShippingCountry->id;
|
||||
}
|
||||
Yard::instance('shopping')->setShippingCountry($selected_country);
|
||||
|
||||
$data = [
|
||||
'user_shop' => Util::getUserShop(),
|
||||
];
|
||||
|
|
@ -76,7 +86,14 @@ class CardController extends Controller
|
|||
return back();
|
||||
}
|
||||
|
||||
public function checkoutCard(){
|
||||
public function checkoutCard(){#
|
||||
if(Input::get('selected_country')){
|
||||
$selected_country = Input::get('selected_country');
|
||||
}else{
|
||||
$ShippingCountry = ShippingCountry::where('country_id', 1)->first();
|
||||
$selected_country = $ShippingCountry->id;
|
||||
}
|
||||
Yard::instance('shopping')->setShippingCountry($selected_country);
|
||||
$data = [
|
||||
'user_shop' => Util::getUserShop(),
|
||||
];
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ class Product extends Model
|
|||
'price_ek',
|
||||
'tax',
|
||||
'price_old',
|
||||
'weight',
|
||||
'contents',
|
||||
'number',
|
||||
'icons',
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class Shipping extends Model
|
|||
}
|
||||
public function getFormattedFree()
|
||||
{
|
||||
if($this->attributes['free'] === null) {
|
||||
if($this->free === null) {
|
||||
return "";
|
||||
}
|
||||
if(\App::getLocale() == "en"){
|
||||
|
|
|
|||
|
|
@ -22,4 +22,5 @@ class ShippingCountry extends Model
|
|||
{
|
||||
return $this->belongsTo('App\Models\Country', 'country_id');
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,47 +18,75 @@ class ShippingPrice extends Model
|
|||
}
|
||||
|
||||
|
||||
public function _format_number($value){
|
||||
public function _format_number($value)
|
||||
{
|
||||
return preg_replace("/[^0-9,]/", "", $value);
|
||||
}
|
||||
|
||||
public function setPriceAttribute( $value ) {
|
||||
public function setPriceAttribute($value)
|
||||
{
|
||||
$value = $this->_format_number($value);
|
||||
$this->attributes['price'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
public function setFactorAttribute( $value ) {
|
||||
$value = $this->_format_number($value);
|
||||
$this->attributes['factor'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
public function setTaxAttribute( $value ) {
|
||||
$value = $this->_format_number($value);
|
||||
$this->attributes['tax'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
public function setPriceOldAttribute( $value ) {
|
||||
$value = $this->_format_number($value);
|
||||
$this->attributes['price_old'] = floatval(str_replace(',', '.', $value));
|
||||
|
||||
}
|
||||
|
||||
public function setTotalFromAttribute( $value ) {
|
||||
public function setFactorAttribute($value)
|
||||
{
|
||||
$value = $this->_format_number($value);
|
||||
$this->attributes['total_from'] = floatval(str_replace(',', '.', $value));
|
||||
if ($value == "") {
|
||||
$this->attributes['factor'] = null;
|
||||
} else {
|
||||
$this->attributes['factor'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
}
|
||||
public function setTotalToAttribute( $value ) {
|
||||
|
||||
public function setTaxAttribute($value)
|
||||
{
|
||||
$value = $this->_format_number($value);
|
||||
$this->attributes['total_to'] = floatval(str_replace(',', '.', $value));
|
||||
if ($value == "") {
|
||||
$this->attributes['tax'] = null;
|
||||
} else {
|
||||
$this->attributes['tax'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function setTotalFromAttribute($value)
|
||||
{
|
||||
$value = $this->_format_number($value);
|
||||
if ($value == "") {
|
||||
$this->attributes['total_from'] = null;
|
||||
} else {
|
||||
$this->attributes['total_from'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
}
|
||||
|
||||
public function setTotalToAttribute($value)
|
||||
{
|
||||
$value = $this->_format_number($value);
|
||||
if ($value == "") {
|
||||
$this->attributes['total_to'] = null;
|
||||
} else {
|
||||
|
||||
$this->attributes['total_to'] = floatval(str_replace(',', '.', $value));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function getFormattedPrice()
|
||||
{
|
||||
if(\App::getLocale() == "en"){
|
||||
if (\App::getLocale() == "en") {
|
||||
return number_format($this->attributes['price'], 2, '.', ',');
|
||||
}
|
||||
return number_format($this->attributes['price'], 2, ',', '.');
|
||||
}
|
||||
|
||||
public function getFormattedTax()
|
||||
{
|
||||
if(\App::getLocale() == "en"){
|
||||
if ($this->attributes['tax'] === NULL) {
|
||||
return $this->attributes['tax'];
|
||||
}
|
||||
if (\App::getLocale() == "en") {
|
||||
return number_format($this->attributes['tax'], 2, '.', ',');
|
||||
}
|
||||
return number_format($this->attributes['tax'], 2, ',', '.');
|
||||
|
|
@ -66,7 +94,10 @@ class ShippingPrice extends Model
|
|||
|
||||
public function getFormattedFactor()
|
||||
{
|
||||
if(\App::getLocale() == "en"){
|
||||
if ($this->attributes['factor'] === NULL) {
|
||||
return $this->attributes['factor'];
|
||||
}
|
||||
if (\App::getLocale() == "en") {
|
||||
return number_format($this->attributes['factor'], 2, '.', ',');
|
||||
}
|
||||
return number_format($this->attributes['factor'], 2, ',', '.');
|
||||
|
|
@ -75,19 +106,25 @@ class ShippingPrice extends Model
|
|||
|
||||
public function getFormatTotalFrom()
|
||||
{
|
||||
if(\App::getLocale() == "en"){
|
||||
if ($this->attributes['total_from'] === NULL) {
|
||||
return $this->attributes['total_from'];
|
||||
}
|
||||
if (\App::getLocale() == "en") {
|
||||
return number_format($this->attributes['total_from'], 2, '.', ',');
|
||||
}
|
||||
return number_format($this->attributes['total_from'], 2, ',', '.');
|
||||
}
|
||||
|
||||
public function getFormattedTotalTo()
|
||||
{
|
||||
if(\App::getLocale() == "en"){
|
||||
if ($this->attributes['total_to'] === NULL) {
|
||||
return $this->attributes['total_to'];
|
||||
}
|
||||
if (\App::getLocale() == "en") {
|
||||
return number_format($this->attributes['total_to'], 2, '.', ',');
|
||||
}
|
||||
return number_format($this->attributes['total_to'], 2, ',', '.');
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,11 @@ class UserShop extends Model
|
|||
return Carbon::parse($this->attributes['active_date'])->format(\Util::formatDateTimeDB());
|
||||
}
|
||||
|
||||
public function getActiveDateFormatSmall(){
|
||||
if(!$this->attributes['active_date']){ return ""; }
|
||||
return Carbon::parse($this->attributes['active_date'])->format("d.m.Y");
|
||||
}
|
||||
|
||||
|
||||
public function getSubdomain()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ namespace App\Services;
|
|||
use App\Models\Attribute;
|
||||
use App\Models\Category;
|
||||
use App\Models\Country;
|
||||
use App\Models\ShippingCountry;
|
||||
|
||||
class HTMLHelper
|
||||
{
|
||||
|
|
@ -189,6 +190,36 @@ class HTMLHelper
|
|||
return $ret;
|
||||
}
|
||||
|
||||
public static function getCountriesWithoutUsedShippings($all=true){#
|
||||
$values = Country::all();
|
||||
$country_ids = ShippingCountry::all()->pluck('country_id')->toArray();
|
||||
$ret = "";
|
||||
if($all){
|
||||
$ret .= '<option value="">'.__('please select').'</option>\n';
|
||||
}
|
||||
foreach ($values as $value){
|
||||
if(!in_array($value->id, $country_ids)){
|
||||
$ret .= '<option value="'.$value->id.'">'.$value->getLocated().'</option>\n';
|
||||
}
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
public static function getCountriesForShipping($id, $all=false){#
|
||||
$values = ShippingCountry::all();
|
||||
$ret = "";
|
||||
if($all){
|
||||
$ret .= '<option value="">'.__('please select').'</option>\n';
|
||||
}
|
||||
foreach ($values as $value){
|
||||
$attr = ($value->id == $id) ? 'selected="selected"' : '';
|
||||
$ret .= '<option value="'.$value->id.'" '.$attr.'>'.$value->country->getLocated().'</option>\n';
|
||||
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static function getSalutation($id){
|
||||
$values = array('mr' => __('MR'), 'ms' => __('MS'));
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
namespace App\Services;
|
||||
|
||||
use App\Models\ShippingCountry;
|
||||
use \Gloudemans\Shoppingcart\Cart;
|
||||
use Gloudemans\Shoppingcart\CartItem;
|
||||
use Illuminate\Session\SessionManager;
|
||||
|
|
@ -11,6 +12,7 @@ class Yard extends Cart
|
|||
{
|
||||
|
||||
private $shipping = 0;
|
||||
private $shipping_country_id = 0;
|
||||
|
||||
public function __construct(SessionManager $session, Dispatcher $events)
|
||||
{
|
||||
|
|
@ -33,6 +35,24 @@ class Yard extends Cart
|
|||
|
||||
}
|
||||
|
||||
public function setShippingCountry($shipping_country_id)
|
||||
{
|
||||
$this->shipping_country_id = $shipping_country_id ;
|
||||
if($this->shipping_country_id > 0){
|
||||
$shippingCountry = ShippingCountry::find($this->shipping_country_id);
|
||||
$shipping = $shippingCountry->shipping;
|
||||
$price = $shipping->prices->first();
|
||||
if($price){
|
||||
$this->setShipping($price->price);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function getShippingCountry()
|
||||
{
|
||||
return $this->shipping_country_id;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param null $decimals
|
||||
* @param null $decimalPoint
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@
|
|||
"Contact": "Kontakt",
|
||||
"waiting for activation since": "wartet auf Aktivierung seit",
|
||||
"edit": "bearbeiten",
|
||||
"delete": "\u00f6schen",
|
||||
"delete": "l\u00f6schen",
|
||||
"your mivita.care team": "Dein mivita.care Team",
|
||||
"create new password": "neues Passwort erstellen",
|
||||
"Now assign a password.": "Vergeben Sie jetzt Ihr Passwort für den Zugriff auf Ihren Account.",
|
||||
|
|
|
|||
|
|
@ -75,9 +75,10 @@
|
|||
{{ Form::text('amount', $product->amount, array('placeholder'=>__('amount'), 'class'=>'form-control', 'id'=>'amount')) }}
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="form-group col-sm-4">
|
||||
<label class="form-label" for="weight">{{ __('Gewicht in g') }}</label>
|
||||
{{ Form::text('weight', $product->weight, array('placeholder'=>__('Gewicht in g'), 'class'=>'form-control', 'id'=>'weight')) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -20,51 +20,254 @@
|
|||
{{ __('Create/Edit Versandkosten') }}
|
||||
</h4>
|
||||
|
||||
{!! Form::open(['url' => route('admin_shipping_store'), 'class' => 'form-horizontal', 'id'=>'']) !!}
|
||||
<input type="hidden" name="id" id="id" value="@if($value->id>0){{$value->id}}@else new @endif">
|
||||
|
||||
<div class="text-left mt-0 mb-2">
|
||||
<button type="submit" class="btn btn-submit">{{ __('save') }}</button>
|
||||
<a href="{{ route('admin_shippings') }}" class="btn btn-default">{{ __('back') }}</a>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card mb-2">
|
||||
|
||||
{!! Form::open(['url' => route('admin_shipping_store'), 'class' => 'form-horizontal', 'id'=>'']) !!}
|
||||
<input type="hidden" name="id" value="@if($value->id>0){{$value->id}}@else new @endif">
|
||||
<h5 class="card-header">
|
||||
{{ __('Versandkosten') }}
|
||||
|
||||
</h5>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox float-right">
|
||||
{!! Form::checkbox('active', 1, $value->active, ['class'=>'custom-control-input']) !!}
|
||||
<span class="custom-control-label">{{__('aktiv')}}</span>
|
||||
</label>
|
||||
<label class="form-label" for="name">{{ __('Name') }}*</label>
|
||||
{{ Form::text('name', $value->name, array('placeholder'=>__('Name'), 'class'=>'form-control'.($errors->has('name') ? ' is-invalid' : ''), 'id'=>'name', 'required')) }}
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
|
||||
<label class="form-label" for="name">{{ __('Name') }}*</label>
|
||||
{{ Form::text('name', $value->name, array('placeholder'=>__('Name'), 'class'=>'form-control'.($errors->has('name') ? ' is-invalid' : ''), 'required')) }}
|
||||
@if ($errors->has('name'))
|
||||
<span class="invalid-feedback" style="display: inline-block;">
|
||||
<strong>{{ $errors->first('name') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="custom-control custom-checkbox float-right">
|
||||
{!! Form::checkbox('active', 1, $value->active, ['class'=>'custom-control-input']) !!}
|
||||
<span class="custom-control-label">{{__('aktiv')}}</span>
|
||||
</label>
|
||||
<label class="form-label" for="title">{{ __('Versandkosten frei ab') }}</label>
|
||||
{{ Form::text('free', $value->getFormattedFree(), array('placeholder'=>__('in Euro, leer lassen ohne Freigrenze'), 'class'=>'form-control')) }}
|
||||
</div>
|
||||
</div>
|
||||
@if ($errors->has('name'))
|
||||
<span class="invalid-feedback" style="display: inline-block;">
|
||||
<strong>{{ $errors->first('name') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="title">{{ __('Free') }}</label>
|
||||
{{ Form::text('free', $value->getFormattedFree(), array('placeholder'=>__('Free'), 'class'=>'form-control', 'id'=>'free')) }}
|
||||
<div class="text-left mt-0 mb-2">
|
||||
<button type="submit" class="btn btn-secondary" name="action" value="shipping">{{ __('save') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
|
||||
@if($value->id>0)
|
||||
<div class="card mb-2">
|
||||
<h6 class="card-header">
|
||||
{{__('Preise')}}
|
||||
</h6>
|
||||
<div class="card-datatable table-responsive">
|
||||
<table class="datatables-style table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="max-width: 60px;"> </th>
|
||||
<th>{{__('Preis')}}</th>
|
||||
<th>{{__('Tax')}}</th>
|
||||
<th>{{__('Preis von - bis')}}</th>
|
||||
<th>{{__('Gewicht von - bis')}}</th>
|
||||
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($value->prices as $price)
|
||||
<tr>
|
||||
<td>
|
||||
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-price"
|
||||
data-id="{{ $price->id }}"
|
||||
data-price="{{ $price->getFormattedPrice() }}"
|
||||
data-tax="{{ $price->getFormattedTax() }}"
|
||||
data-factor="{{ $price->getFormattedFactor() }}"
|
||||
data-total_from="{{ $price->getFormatTotalFrom() }}"
|
||||
data-total_to="{{ $price->getFormattedTotalTo() }}"
|
||||
data-weight_from="{{ $price->weight_from }}"
|
||||
data-weight_to="{{ $price->weight_to }}">
|
||||
<span class="far fa-edit"></span>
|
||||
</button>
|
||||
</td>
|
||||
<td>{{ $price->getFormattedPrice() }}</td>
|
||||
<td>{{ $price->getFormattedTax() }}</td>
|
||||
<td>{{ $price->getFormatTotalFrom() }} - {{ $price->getFormattedTotalTo() }}</td>
|
||||
<td>{{ $price->weight_from }} - {{ $price->weight_to }}</td>
|
||||
<td><a class="text-danger" href="{{ route('admin_shipping_price_delete', [$price->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="mt-4 ml-4">
|
||||
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-price"
|
||||
data-id="new"
|
||||
data-price=""
|
||||
data-tax=""
|
||||
data-factor="1"
|
||||
data-total_from=""
|
||||
data-total_to=""
|
||||
data-weight_from=""
|
||||
data-weight_to=""
|
||||
>{{__('Neuen Preis erstellen')}}</button>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-left mt-0 mb-2">
|
||||
<button type="submit" class="btn btn-submit">{{ __('save') }}</button>
|
||||
<a href="{{ route('admin_shippings') }}" class="btn btn-default">{{ __('back') }}</a>
|
||||
|
||||
<!-- Modal template price -->
|
||||
<div class="modal fade" id="modals-price">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_shipping_store') }}" method="post">
|
||||
@csrf
|
||||
<input type="hidden" name="id">
|
||||
<input type="hidden" name="shipping_id" value="@if($value->id>0){{$value->id}}@else new @endif">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title"> {{__('Preis')}} <span class="font-weight-light">{{__('create/edit')}}</span></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-6">
|
||||
<label for="price" class="form-label">{{__('Preis (brutto)')}}*</label>
|
||||
<input type="text" class="form-control" name="price" placeholder="{{__('Preis in Euro')}}" required>
|
||||
</div>
|
||||
<div class="form-group col-6">
|
||||
<label for="tax" class="form-label">{{__('enthaltene Tax (%)')}}</label>
|
||||
<input type="text" class="form-control" name="tax" placeholder="{{__('Tax in %')}}">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-6">
|
||||
<label for="total_from" class="form-label">{{__('von Preis')}}</label>
|
||||
<input type="text" class="form-control" name="total_from" placeholder="{{__('Preis in Euro')}}">
|
||||
</div>
|
||||
<div class="form-group col-6">
|
||||
<label for="total_to" class="form-label">{{__('bis Preis')}}</label>
|
||||
<input type="text" class="form-control" name="total_to" placeholder="{{__('Preis in Euro')}}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-6">
|
||||
<label for="weight_from" class="form-label">{{__('von Gewicht (g)')}}</label>
|
||||
<input type="text" class="form-control" name="weight_from" placeholder="{{__('in g')}}">
|
||||
</div>
|
||||
<div class="form-group col-6">
|
||||
<label for="weight_to" class="form-label">{{__('bis Gewicht (g)')}}</label>
|
||||
<input type="text" class="form-control" name="weight_to" placeholder="{{__('in g')}}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary" name="action" value="price">{{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{!! Form::close() !!}
|
||||
<div class="card mb-2">
|
||||
<h6 class="card-header">
|
||||
{{__('Länder')}}
|
||||
</h6>
|
||||
<div class="card-datatable table-responsive">
|
||||
<table class="datatables-style table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{__('Land')}}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($value->countries as $country)
|
||||
<tr>
|
||||
<td>
|
||||
{{ $country->country->de }}
|
||||
</td>
|
||||
<td><a class="text-danger" href="{{ route('admin_shipping_country_delete', [$country->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="mt-4 ml-4">
|
||||
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-country"
|
||||
data-id="new"
|
||||
>{{__('Land hinzufügen')}}</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modals-country">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_shipping_store') }}" method="post">
|
||||
@csrf
|
||||
<input type="hidden" name="id">
|
||||
<input type="hidden" name="shipping_id" value="@if($value->id>0){{$value->id}}@else new @endif">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title"> {{__('Preis')}} <span class="font-weight-light">{{__('create/edit')}}</span></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
<label for="country_ids" class="form-label">{{__('Versandkosten gelten für diese Länder')}}</label>
|
||||
<select class="selectpicker" data-style="btn-default" name="country_ids[]" multiple>
|
||||
{!! HTMLHelper::getCountriesWithoutUsedShippings() !!}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary" name="action" value="country">{{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
|
||||
$('#modals-price').on('show.bs.modal', function (event) {
|
||||
var button = $(event.relatedTarget);
|
||||
$(this).find(".modal-content input[name='id']").val(button.data('id'));
|
||||
$(this).find(".modal-body input[name='price']").val(button.data('price'));
|
||||
$(this).find(".modal-body input[name='tax']").val(button.data('tax'));
|
||||
$(this).find(".modal-body input[name='factor']").val(button.data('factor'));
|
||||
$(this).find(".modal-body input[name='total_from']").val(button.data('total_from'));
|
||||
$(this).find(".modal-body input[name='total_to']").val(button.data('total_to'));
|
||||
$(this).find(".modal-body input[name='weight_from']").val(button.data('weight_from'));
|
||||
$(this).find(".modal-body input[name='weight_to']").val(button.data('weight_to'));
|
||||
});
|
||||
|
||||
$('#modals-country').on('show.bs.modal', function (event) {
|
||||
var button = $(event.relatedTarget);
|
||||
$(this).find(".modal-content input[name='id']").val(button.data('id'));
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endif
|
||||
<div class="text-left mt-2 mb-2">
|
||||
<a href="{{ route('admin_shippings') }}" class="btn btn-default">{{ __('back') }}</a>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,8 @@
|
|||
"iDisplayLength": 50,
|
||||
"aoColumns": [
|
||||
{ "sWidth": "10%" },
|
||||
{ "sWidth": "80%" },
|
||||
{ "sWidth": "70%" },
|
||||
{ "sWidth": "10%" },
|
||||
{ "sWidth": "10%" },
|
||||
],
|
||||
"language": {
|
||||
|
|
|
|||
|
|
@ -15,11 +15,13 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>{{__('edit')}}</th>
|
||||
<th>{{__('Name')}}</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Zugang')}}</th>
|
||||
<th>{{__('verified')}}</th>
|
||||
<th>{{__('active')}}</th>
|
||||
<th>{{__('shop')}}</th>
|
||||
<th>{{__('delete')}}</th>
|
||||
|
||||
</tr>
|
||||
|
|
@ -104,11 +106,13 @@
|
|||
"ajax": '{!! route('data_table_users') !!}',
|
||||
"columns": [
|
||||
{ data: 'action_edit', orderable: false, searchable: false},
|
||||
{ data: 'name', name: 'name' },
|
||||
{ data: 'first_name', name: 'first_name' },
|
||||
{ data: 'last_name', name: 'last_name' },
|
||||
{ data: 'email', name: 'email' },
|
||||
{ data: 'admin', name: 'admin' },
|
||||
{ data: 'confirmed', name: 'confirmed' },
|
||||
{ data: 'active', name: 'active' },
|
||||
{ data: 'shop', name: 'shop' },
|
||||
{ data: 'action_delete', orderable: false, searchable: false},
|
||||
],
|
||||
"bLengthChange": false,
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@
|
|||
|
||||
</style>
|
||||
<!-- -->
|
||||
{{ Yard::instance('shopping')->setShipping(5.9) }}
|
||||
<section>
|
||||
<div class="container">
|
||||
|
||||
|
|
@ -158,7 +157,7 @@
|
|||
|
||||
@endforeach
|
||||
</div>
|
||||
<a href="{{route(Util::getPostRoute().'card_delete', Util::addRoute())}}" class="btn btn-default margin-top-20 margin-right-10 pull-left"><i class="glyphicon glyphicon-remove"></i> Warenkorb löschen</a>
|
||||
<a href="{{route(Util::getPostRoute().'card_delete', Util::addRoute())}}" class="btn btn-default btn-sm margin-top-20 margin-right-10 pull-left"><i class="glyphicon glyphicon-remove"></i> Warenkorb löschen</a>
|
||||
<button type="submit" class="btn btn-primary margin-top-20 pull-right"><i class="glyphicon glyphicon-refresh"></i> Warenkorb aktualisieren</button>
|
||||
|
||||
<div class="clearfix"></div>
|
||||
|
|
@ -171,7 +170,16 @@
|
|||
|
||||
</div>
|
||||
|
||||
|
||||
<style>
|
||||
.select2-container{
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
.select2-container .select2-selection--single .select2-selection__rendered
|
||||
{
|
||||
padding: 8px 20px;
|
||||
height: 36px;
|
||||
}
|
||||
</style>
|
||||
<!-- RIGHT -->
|
||||
<div class="col-lg-3 col-sm-5">
|
||||
|
||||
|
|
@ -187,6 +195,18 @@
|
|||
<span class="pull-right">{{ Yard::instance('shopping')->total() }} €</span>
|
||||
<strong class="pull-left">Zwischensumme:</strong>
|
||||
</div>
|
||||
<hr class="mt-4 mb-4">
|
||||
|
||||
<div class="clearfix mb-2">
|
||||
<div class=" small">Versandland:</div>
|
||||
<div class="small">
|
||||
<form action="{{ route(Util::getPostRoute().'card_show', Util::addRoute()) }}" method="GET" style="margin-bottom: 0;">
|
||||
<select name="selected_country" class="select2" onchange="this.form.submit()">
|
||||
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountry()) !!}
|
||||
</select>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small">{{ Yard::instance('shopping')->shipping() }} € </span>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@
|
|||
|
||||
</style>
|
||||
<!-- -->
|
||||
{{ Yard::instance('shopping')->setShipping(5.9) }}
|
||||
<!-- CART -->
|
||||
<!-- CHECKOUT -->
|
||||
<section>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,14 @@
|
|||
}
|
||||
</style>
|
||||
|
||||
<section class="page-header page-header-xlg parallax parallax-3"
|
||||
style="background-image:url('assets/images/vision-min.jpg')">
|
||||
<div class="overlay dark-1"><!-- dark overlay [1 to 9 opacity] --></div>
|
||||
|
||||
<div class="container">
|
||||
<h1>{{ $user_shop->name }} mivita online Shop</h1>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<!-- -->
|
||||
|
|
|
|||
|
|
@ -189,7 +189,10 @@ Route::domain('mein.mivita.local')->group(function () {
|
|||
Route::get('/admin/shippings', 'ShippingController@index')->name('admin_shippings');
|
||||
Route::get('/admin/shipping/edit/{shipping_id}', 'ShippingController@edit')->name('admin_shipping_edit');
|
||||
Route::post('/admin/shipping/store', 'ShippingController@store')->name('admin_shipping_store');
|
||||
Route::get('/admin/shipping/delete/{shipping_id}', 'ShippingController@deleteUser')->name('admin_shipping_delete');
|
||||
Route::get('/admin/shipping/delete/{shipping_id}', 'ShippingController@deleteShipping')->name('admin_shipping_delete');
|
||||
Route::get('/admin/shipping/price/delete/{price_id}', 'ShippingController@deletePrice')->name('admin_shipping_price_delete');
|
||||
Route::get('/admin/shipping/country/delete/{price_id}', 'ShippingController@deleteCountry')->name('admin_shipping_country_delete');
|
||||
|
||||
|
||||
Route::get('data_table', 'DataTableController@datatable')->name('data_table');
|
||||
// Route::get('datatables/leads', 'DataTableController@getLeads')->name('datatables-leads');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue