Skip to content

F
fazo
Commit 7869077b authored by Shahzod's avatar Shahzod
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/workspace.xml
#	resources/views/pages/tarifs/index.blade.php
parents d21e0833 32d34658
Show whitespace changes
Inline Side-by-side
Showing with 242 additions and 507 deletions
.idea/workspace.xml
View file @ 7869077b
......@@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/main.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/main.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -32,118 +31,9 @@
<expand />
<select />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="234" column="91" selection-start-line="234" selection-start-column="91" selection-end-line="234" selection-end-column="91" />
<folding>
<element signature="n#style#0;n#a#0;n#li#4;n#ul#0;n#div#1;n#div#1;n#nav#0;n#div#0;n#header#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#3;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#6;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#6;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="176" column="91" selection-start-line="176" selection-start-column="91" selection-end-line="176" selection-end-column="91" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/slider/css/style.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/terms.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="935">
<caret line="55" column="46" selection-start-line="55" selection-start-column="46" selection-end-line="55" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
<caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663">
<caret line="39" column="54" selection-start-line="39" selection-start-column="54" selection-end-line="39" selection-end-column="54" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/about.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="26" column="108" selection-start-line="26" selection-start-column="108" selection-end-line="26" selection-end-column="108" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2295">
<caret line="135" column="76" selection-start-line="135" selection-start-column="76" selection-end-line="135" selection-end-column="76" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/main.blade.php" />
</list>
</option>
</component>
<component name="PhpWorkspaceProjectConfiguration">
<include_path>
<path value="$PROJECT_DIR$/vendor/laravel/framework" />
......@@ -246,73 +136,10 @@
<path value="$PROJECT_DIR$/vendor/kylekatarnls/update-helper" />
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1382" />
<option name="height" value="744" />
</component>
<component name="ProjectId" id="1RvHVuLiAecoShWzzuyXsxpQGtI" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="layouts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="tarifs" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="routes" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="true" />
......@@ -394,8 +221,7 @@
<workItem from="1569048123758" duration="278000" />
<workItem from="1570474579928" duration="2098000" />
<workItem from="1570507468153" duration="6606000" />
<workItem from="1570540679279" duration="4734000" />
<workItem from="1570641178982" duration="4101000" />
<workItem from="1570540679279" duration="7153000" />
</task>
<task id="LOCAL-00001" summary="first commit (10/07/2019//11/;58)">
<created>1570475345391</created>
......@@ -474,62 +300,44 @@
<option name="project" value="LOCAL" />
<updated>1570567783874</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="fix bugs">
<created>1570568042501</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1570568042501</updated>
</task>
<task id="LOCAL-00013" summary="fix bugs">
<created>1570568378483</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1570568378483</updated>
</task>
<task id="LOCAL-00014" summary="fix bugs">
<created>1570568481755</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1570568481755</updated>
</task>
<task id="LOCAL-00015" summary="fix bugs">
<created>1570571079676</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1570571079676</updated>
</task>
<task id="LOCAL-00016" summary="fix bugs">
<created>1570571395627</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1570571395627</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6134000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13388805" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info id="npm" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.2831424" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.27659574" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" />
<window_info anchor="right" id="Database" order="4" weight="0.32980332" />
</layout>
<layout-to-restore>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21860817" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info id="npm" order="3" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32936078" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.2831424" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.27659574" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" />
<window_info anchor="right" id="Database" order="4" weight="0.32980332" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
......@@ -539,12 +347,6 @@
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER" />
</State>
</value>
......@@ -584,93 +386,4 @@
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-233">
<caret line="59" column="13" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/css/ship/main.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/slider/css/style.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/terms.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="935">
<caret line="55" column="46" selection-start-line="55" selection-start-column="46" selection-end-line="55" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/admin.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
<caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663">
<caret line="39" column="54" selection-start-line="39" selection-start-column="54" selection-end-line="39" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/about.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="26" column="108" selection-start-line="26" selection-start-column="108" selection-end-line="26" selection-end-column="108" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2295">
<caret line="135" column="76" selection-start-line="135" selection-start-column="76" selection-end-line="135" selection-end-column="76" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="176" column="91" selection-start-line="176" selection-start-column="91" selection-end-line="176" selection-end-column="91" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/main.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="234" column="91" selection-start-line="234" selection-start-column="91" selection-end-line="234" selection-end-column="91" />
<folding>
<element signature="n#style#0;n#a#0;n#li#4;n#ul#0;n#div#1;n#div#1;n#nav#0;n#div#0;n#header#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#3;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#4;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#5;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#6;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#6;n#div#2;n#div#0;n#div#0;n#main#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
resources/views/main.blade.php
View file @ 7869077b
......@@ -147,7 +147,7 @@
<div id="home">
<!-- Start cSlider -->
<div id="da-slider" class="da-slider" style="background-image: url('{{asset('assets')}}/slider/images/icons.png')">
<div id="da-slider" class="da-slider" style="background-image: url('{{asset('assets')}}/slider/images/iconcc.jpg')">
<div class="triangle" ></div>
<!-- mask elemet use for masking background image -->
<div class="mask" style="background-color: #328CC1;"></div>
......
resources/views/pages/tarifs/index.blade.php
View file @ 7869077b
......@@ -2,11 +2,13 @@
@section('page-title', 'Мои посылки')
@section('content')
<br><br><br>
<section class="section section-inset-1">
<div class="container">
<div class="">
<h4 style="text-align: center; color: #004085;">ТАРИФЫ</h4><br>
<h6>
Компания Fazo Cargo INC. осущетсвляет доставку посылок (WSD/WSG), содержащих потребительских товаров курьерским каналом в рамках таможенных
Компания Fazo Cargo INC. осущетсвляет доставку посылок (WSD/WSG), содержащих потребительских товаров
курьерским каналом в рамках таможенных
норм Республики Узбекистан, согласно действующему законодательству.<br>
На данное время осуществляем доставку по следующим тарифам:
</h6>
......@@ -16,7 +18,8 @@
<table class="table table-bordered rounded shadow bg-white">
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">ПЕРЕВОЗКА
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">
ПЕРЕВОЗКА
ИСХОДЯЩЕЙ ПОСЫЛКИ ИЗ США В УЗБЕКИСТАН
</p>
</td>
......@@ -33,7 +36,8 @@
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">СРОКИ ДОСТАВКИ</p>
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">СРОКИ
ДОСТАВКИ</p>
</td>
<td>
<ul style="text-align: center; margin-bottom: 0px;">
......@@ -44,7 +48,8 @@
</tr>
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">САМОВЫВОЗ В г.ТАШКЕНТЕ
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">
САМОВЫВОЗ В г.ТАШКЕНТЕ
</p>
</td>
<td>
......@@ -60,20 +65,23 @@
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">ДОСТАВКА ПОСЫЛОК В УЗБЕКИСТАНЕ
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">
ДОСТАВКА ПОСЫЛОК В УЗБЕКИСТАНЕ
</p>
</td>
<td>
<ul style="text-align: center; margin-bottom: 0px;">
<h6 style=""><b>Ташкент – <span style="color: red">бесплатно.</span></b></h6>
<h6 style="margin-bottom: 0px;"><b>Регионы – <span style="color: red">бесплатно.</span></b></h6>
<h6 style="margin-bottom: 0px;"><b>Регионы – <span style="color: red">бесплатно.</span></b>
</h6>
</ul>
</td>
</tr>
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">СТРАХОВКА
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">
СТРАХОВКА
опционально, не обязательно*
</p>
......@@ -87,81 +95,95 @@
</tr>
</table>
<br /><br/>
<br/><br/>
<p style="font-size: 18px;"><span class="text-danger">*</span> Предельные нормы на одну посылку в адрес одного получателя:</p>
<p style="font-size: 18px;"><span class="text-danger">*</span> Предельные нормы на одну посылку в адрес
одного получателя:</p>
<ul class="mb-5">
<li><p style="font-size: 18px;">Вес посылки не более 30 кг</p></li>
<li><p style="font-size: 18px;">Суммарная стоимость товаров в посылке - до $1000</p></li>
<li><p style="font-size: 18px;">Не более 2 идентичных товаров в одной посылке на одного получателя</p></li>
<li><p style="font-size: 18px;">Не более 2 идентичных товаров в одной посылке на одного получателя</p>
</li>
</ul>
<p style="font-size: 18px;">Отправка данного типа посылок в г.Ташкент производится еженедельно по четвергам и воскресеньям.
<p style="font-size: 18px;">Отправка данного типа посылок в г.Ташкент производится еженедельно по четвергам
и воскресеньям.
Срок доставки с момента отправки: 5-7 рабочих дней.
</p>
<br />
<p> <b><i><span class="text-danger">*</span> Страхование посылки не является обязательным при отправке посылок из США в Узбекистан и может быть исключено из счета. При выборе опции "Не страховать груз", клиент даёт согласие
на потенциальные риски и форс-мажорные условия, связанные с повреждением или утерей исходящей посылки.<br>
<span class="text-danger">**</span> Для клиентов, отправляющих в месяц более 50 кг, предоставляется возможность специальных скидок. Для подробней информации,<b> свяжитесь с администрацией Fazoshop.us</b>
<br/>
<p><b><i><span class="text-danger">*</span> Страхование посылки не является обязательным при отправке
посылок из США в Узбекистан и может быть исключено из счета. При выборе опции "Не страховать
груз", клиент даёт согласие
на потенциальные риски и форс-мажорные условия, связанные с повреждением или утерей исходящей
посылки.<br>
<span class="text-danger">**</span> Для клиентов, отправляющих в месяц более 50 кг,
предоставляется возможность специальных скидок. Для подробней информации,<b> свяжитесь с
администрацией Fazoshop.us</b>
</i> </b></p>
<br><br><br>
<h4 class="my-4" style="color: #004085;">Тарифы на складские и дополнительные услуги</h4>
<br><br><br>
<h4 class="my-4" style="color: #004085;">Тарифы на складские и дополнительные услуги</h4>
<table class="table table-bordered rounded shadow bg-white">
<table class="table table-bordered rounded shadow bg-white">
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">ПРИЕМ ПОСЫЛОК НА СКЛАД В США </p>
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">ПРИЕМ
ПОСЫЛОК НА СКЛАД В США </p>
</td>
<td>
<ul style="text-align: center; margin-bottom: 0px;">
<h6 style=""><b>Приём и обработка посылок наших клиентов, поступающих на </b></h6>
<h6 style="margin-bottom: 0px;"><b>наши склады в США осуществляется -- <span style="color: red">бесплатно.</span></b></h6>
<h6 style="margin-bottom: 0px;"><b>наши склады в США осуществляется -- <span
style="color: red">бесплатно.</span></b></h6>
</ul>
</td>
</tr>
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">КОНСОЛИДАЦИЯ ПОСЫЛОК</p>
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">
КОНСОЛИДАЦИЯ ПОСЫЛОК</p>
</td>
<td>
<ul style="text-align: center; margin-bottom: 0px;">
<h6 style=""><b>Консолидация, т.е. объединение товаров, поступающих </b></h6>
<h6 style="margin-bottom: 0px;"><b>на наши склады в США - <span style="color: red">$ 10 за кг.</span></b></h6>
<h6 style="margin-bottom: 0px;"><b>на наши склады в США - <span style="color: red">$ 10 за кг.</span></b>
</h6>
</ul>
</td>
</tr>
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">ДОПОЛНИТЕЛЬНЫЙ УПАКОВОЧНЫЙ МАТЕРИАЛ</p>
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">
ДОПОЛНИТЕЛЬНЫЙ УПАКОВОЧНЫЙ МАТЕРИАЛ</p>
</td>
<td>
<ul style="text-align: center; margin-bottom: 0px;">
<h6 style=""><b>Дополнительный упаковочный материал; упаковочные пузыри,</b></h6>
<h6 style="margin-bottom: 0px;"><b> бумаги и т.п.- <span style="color: red">бесплатно. </span></b></h6>
<h6 style="margin-bottom: 0px;"><b> бумаги и т.п.- <span
style="color: red">бесплатно. </span></b></h6>
</ul>
</td>
</tr>
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">ХРАНЕНИЕ ПОСЫЛОК
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">
ХРАНЕНИЕ ПОСЫЛОК
НА НАШИХ СКЛАДАХ
</p>
</td>
<td>
<ul style="text-align: center; margin-bottom: 0px;">
<h6 style=""><b>Хранение посылок на наших складах в США сроком до 2 месяцев – <span style="color: red">бесплатно. </span></b></h6>
<h6 style="margin-bottom: 0px;"><b> Свыше этого срока, тариф за хранение -<span style="color: red"> $10,00 за каждый месяц. </span></b></h6>
<h6 style=""><b>Хранение посылок на наших складах в США сроком до 2 месяцев – <span
style="color: red">бесплатно. </span></b></h6>
<h6 style="margin-bottom: 0px;"><b> Свыше этого срока, тариф за хранение -<span
style="color: red"> $10,00 за каждый месяц. </span></b></h6>
</ul>
</td>
</tr>
......@@ -169,23 +191,23 @@
<tr>
<td style="padding-top: 25px;">
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">СВЕРКА ТОВАРОВ, ПРИОБРЕТЕННЫХ ПО ИНТЕРНЕТУ
<p style="font-size: 18px; text-transform: uppercase; text-align: center; margin: 0px; ">СВЕРКА
ТОВАРОВ, ПРИОБРЕТЕННЫХ ПО ИНТЕРНЕТУ
</p>
</td>
<td>
<ul style="text-align: center; margin-bottom: 0px;">
<h6 style=""><b>Наши сотрудники готовы оказать услугу по сверке товаров на </b></h6>
<h6 style="margin-bottom: 0px;"><b>соответствие с Вашим инвойсом за -<span style="color: red"> $10,00 за одну посылку. </span></b></h6>
<h6 style=""><b>Наши сотрудники готовы оказать услугу по сверке товаров на </span></b></h6>
<h6 style="margin-bottom: 0px;"><b>соответствие с Вашим инвойсом за -<span
style="color: red"> $10,00 за одну посылку. </span></b></h6>
</ul>
</td>
</tr>
</table>
</table>
</div>
</section>
@endsection
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment