Skip to content

F
fazo
Commit 898273e7 authored by Ruslan's avatar Ruslan
Browse files
Options

Stage 1

parent 62b586ac
Hide whitespace changes
Inline Side-by-side
Showing with 306 additions and 199 deletions
.idea/workspace.xml
View file @ 898273e7
......@@ -2,12 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45142ad9-1f6f-4356-8738-3011f539d65e" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/views/pages/parcels/packages_pending.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/addaddress.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/addaddress.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/address.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/address.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/profile/address_add.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/address_add.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -22,13 +26,14 @@
<session id="1125383165">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="6" />
<entry key="project.closed" value="7" />
<entry key="project.open.time.0" value="3" />
<entry key="project.open.time.1" value="1" />
<entry key="project.open.time.1" value="2" />
<entry key="project.open.time.13" value="1" />
<entry key="project.open.time.14" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.open.time.31" value="1" />
<entry key="project.opened" value="7" />
<entry key="project.opened" value="9" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
......@@ -36,7 +41,7 @@
<entry key="css" value="5" />
<entry key="env" value="1" />
<entry key="ico" value="1" />
<entry key="php" value="123" />
<entry key="php" value="134" />
<entry key="png" value="4" />
<entry key="svg" value="1" />
<entry key="woff2" value="1" />
......@@ -44,10 +49,10 @@
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="Blade" value="66" />
<entry key="Blade" value="73" />
<entry key="CSS" value="5" />
<entry key="Image" value="5" />
<entry key="PHP" value="57" />
<entry key="PHP" value="61" />
<entry key="PLAIN_TEXT" value="2" />
<entry key="SVG" value="1" />
</counts>
......@@ -56,14 +61,14 @@
<counts>
<entry key="css" value="14" />
<entry key="env" value="15" />
<entry key="php" value="16999" />
<entry key="php" value="17798" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Blade" value="10345" />
<entry key="Blade" value="11112" />
<entry key="CSS" value="14" />
<entry key="PHP" value="6654" />
<entry key="PHP" value="6686" />
<entry key="PLAIN_TEXT" value="15" />
</counts>
</usages-collector>
......@@ -74,17 +79,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="11" selection-end-column="18" />
<state relative-caret-position="1012">
<caret line="44" column="43" selection-start-line="44" selection-start-column="43" selection-end-line="44" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<entry file="file://$PROJECT_DIR$/app/Models/Address.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
<caret line="57" column="4" selection-start-line="57" selection-start-column="4" selection-end-line="74" />
<state relative-caret-position="1012">
<caret line="49" column="31" selection-start-line="49" selection-start-column="20" selection-end-line="49" selection-end-column="31" />
</state>
</provider>
</entry>
......@@ -92,68 +97,67 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<state relative-caret-position="92">
<caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="10" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2312">
<caret line="136" column="7" selection-start-line="136" selection-start-column="7" selection-end-line="136" selection-end-column="7" />
<state relative-caret-position="1495">
<caret line="75" column="34" selection-start-line="75" selection-start-column="34" selection-end-line="75" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/AddressController.php">
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="26" selection-start-line="26" selection-end-line="26" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="966">
<caret line="51" column="31" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user_new.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="69" column="34" lean-forward="true" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="437">
<caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="56" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_pending.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
<state relative-caret-position="299">
<caret line="13" column="61" selection-start-line="13" selection-start-column="61" selection-end-line="13" selection-end-column="61" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_pending.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/address_add.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="57" column="38" selection-start-line="57" selection-start-column="38" selection-end-line="57" selection-end-column="38" />
<state relative-caret-position="828">
<caret line="45" column="58" selection-start-line="45" selection-start-column="58" selection-end-line="45" selection-end-column="58" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="13" column="125" selection-start-line="13" selection-start-column="80" selection-end-line="13" selection-end-column="125" />
<state relative-caret-position="1357">
<caret line="59" column="41" selection-start-line="59" selection-start-column="41" selection-end-line="59" selection-end-column="41" />
</state>
</provider>
</entry>
......@@ -162,7 +166,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>images</find>
<find>Dashboard</find>
<find>David</find>
<find>logo</find>
......@@ -186,12 +189,13 @@
<find>profile</find>
<find>ProfileController@profile</find>
<find>addr</find>
<find>pending_packages</find>
<find>register</find>
<find>exists</find>
<find>sign</find>
<find>Декларация</find>
<find>address</find>
<find>device</find>
<find>pending_packages</find>
</findStrings>
<replaceStrings>
<replace />
......@@ -235,10 +239,7 @@
<option value="$PROJECT_DIR$/app/Http/Controllers/FeedbackController.php" />
<option value="$PROJECT_DIR$/resources/views/about.blade.php" />
<option value="$PROJECT_DIR$/resources/views/contacts.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/public/css/style.css" />
<option value="$PROJECT_DIR$/public/frontend/css/style.css" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
......@@ -247,9 +248,14 @@
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/addaddress.blade.php" />
<option value="$PROJECT_DIR$/resources/views/address.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/address_add.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user_new.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
</list>
</option>
</component>
......@@ -362,10 +368,10 @@
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1912" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1056" />
<option name="x" value="-10" />
<option name="y" value="-10" />
<option name="width" value="1940" />
<option name="height" value="1050" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
......@@ -411,6 +417,17 @@
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
......@@ -479,13 +496,13 @@
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles" />
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\adminstyles\css" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\Programm Files\OpenServer\OSPanel\domains\fazoshop\fazoshop\public\frontend\fonts" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
......@@ -515,18 +532,19 @@
<workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="41602000" />
<workItem from="1560524548209" duration="1799000" />
<workItem from="1560527178382" duration="2629000" />
<workItem from="1560527178382" duration="8153000" />
<workItem from="1560763340093" duration="125000" />
<workItem from="1561443616644" duration="593000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="120227000" />
<option name="totallyTimeSpent" value="126469000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18017058" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23355705" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -539,7 +557,7 @@
<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" visible="true" weight="0.21691974" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.28368795" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50067115" side_tool="true" weight="0.2776204" />
<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" />
......@@ -603,34 +621,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="55" column="89" selection-start-line="55" selection-start-column="89" selection-end-line="55" selection-end-column="89" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/UsersController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<caret line="70" column="14" selection-start-line="70" selection-start-column="14" selection-end-line="70" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/ActivitylogController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/admin/activity/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="680">
<caret line="40" column="35" selection-end-line="55" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Feedback.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
......@@ -750,20 +740,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486">
<caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="591">
<caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/contacts.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
......@@ -788,20 +764,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="35" column="32" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="406">
<caret line="64" column="82" selection-start-line="64" selection-start-column="82" selection-end-line="64" selection-end-column="82" />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/Core/Core_c.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
......@@ -830,13 +792,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2358">
<caret line="141" column="38" selection-start-line="141" selection-start-column="38" selection-end-line="141" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/frontend/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1615">
......@@ -858,13 +813,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4199">
<caret line="259" column="41" selection-start-line="259" selection-start-column="41" selection-end-line="259" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/address.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
......@@ -879,72 +827,135 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/AddressController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="10" selection-end-column="14" />
<state relative-caret-position="306">
<caret line="26" selection-start-line="26" selection-end-line="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2312">
<caret line="136" column="7" selection-start-line="136" selection-start-column="7" selection-end-line="136" selection-end-column="7" />
<state relative-caret-position="102">
<caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/AddressController.php">
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="26" selection-start-line="26" selection-end-line="26" />
<folding>
<element signature="e#133#169#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="234">
<caret line="13" column="125" selection-start-line="13" selection-start-column="80" selection-end-line="13" selection-end-column="125" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/addaddress.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="16" column="57" lean-forward="true" selection-start-line="16" selection-start-column="57" selection-end-line="16" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/address_add.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="548">
<caret line="120" column="61" selection-start-line="120" selection-start-column="61" selection-end-line="120" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="265" column="5" lean-forward="true" selection-start-line="265" selection-start-column="5" selection-end-line="265" selection-end-column="5" />
</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="2448">
<caret line="136" column="7" selection-start-line="136" selection-start-column="7" selection-end-line="136" selection-end-column="7" />
</state>
</provider>
</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="48">
<caret line="69" column="34" lean-forward="true" selection-start-line="69" selection-start-column="34" selection-end-line="69" selection-end-column="34" />
<state relative-caret-position="378">
<caret line="45" column="9" lean-forward="true" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
<state relative-caret-position="260">
<caret line="58" column="38" selection-start-line="58" selection-start-column="38" selection-end-line="58" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/addresses.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="11" selection-end-column="18" />
<state relative-caret-position="1012">
<caret line="44" column="43" selection-start-line="44" selection-start-column="43" selection-end-line="44" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<entry file="file://$PROJECT_DIR$/app/Models/Address.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="13" column="125" selection-start-line="13" selection-start-column="80" selection-end-line="13" selection-end-column="125" />
<state relative-caret-position="1012">
<caret line="49" column="31" selection-start-line="49" selection-start-column="20" selection-end-line="49" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/addaddress.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="16" column="57" lean-forward="true" selection-start-line="16" selection-start-column="57" selection-end-line="16" selection-end-column="57" />
<state relative-caret-position="92">
<caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="10" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/address_add.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1495">
<caret line="75" column="34" selection-start-line="75" selection-start-column="34" selection-end-line="75" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="966">
<caret line="51" column="31" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="56" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/packages/packages_pending.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="13" column="61" selection-start-line="13" selection-start-column="61" selection-end-line="13" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_pending.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/packages_inwarehouse.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1357">
<caret line="59" column="41" selection-start-line="59" selection-start-column="41" selection-end-line="59" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="57" column="38" selection-start-line="57" selection-start-column="38" selection-end-line="57" selection-end-column="38" />
<state relative-caret-position="828">
<caret line="45" column="58" selection-start-line="45" selection-start-column="58" selection-end-line="45" selection-end-column="58" />
</state>
</provider>
</entry>
......
app/Http/Controllers/PackagesController.php
View file @ 898273e7
......@@ -33,7 +33,7 @@ class PackagesController extends Controller
$packages = Package::where('user_id', Auth::id())->where('status', 'pending')->orderBy('id', 'desc')->get();
$declarationJson = $this->makeDeclarationJSON($packages);
return view('pages.packages.packages_pending', [
return view('pages.parcels.index', [
'packages' => $packages,
'jsonStructure' => $declarationJson,
'countPackages' => $this->countPackages(),
......@@ -73,7 +73,7 @@ class PackagesController extends Controller
$packages = Package::where('user_id', Auth::id())->where('status', 'instore')->orderBy('id', 'desc')->get();
return view('pages.packages.packages_inwarehouse', [
return view('pages.parcels.packages_inwarehouse', [
'packages' => $packages,
'jsonStructure' => $this->makeDeclarationJSON($packages),
'countPackages' => $this->countPackages(),
......
app/Http/Controllers/ProfileController.php
View file @ 898273e7
......@@ -256,7 +256,7 @@ class ProfileController extends Controller
public function address()
{
$units = Address::where('user_id', '=', Auth::user()->id);
$units = Address::where('user_id', '=', Auth::user()->id)->get();
return view('pages.profile.addresses', compact('units'));
}
......
resources/views/layouts/user_new.blade.php
View file @ 898273e7
......@@ -6,11 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>FazoShop.us</title>
<link rel="canonical" href="https://getbootstrap.com/docs/4.3/examples/pricing/">
<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="{{ asset('css/font-awesome.min.css') }}" >
<style>
body {
......@@ -49,7 +47,7 @@
footer{
background-color: #fff;
}
.text-top-title { color: #6b8eea!important }
.text-top-title { color: #567ee6!important }
</style>
</head>
<body>
......
resources/views/pages/parcels/index.blade.php
View file @ 898273e7
@extends('layouts.user')
@extends('layouts.user_new')
@section('content')
<section class="bg-light section-lg">
<ol class="breadcrumb">
</ol>
</section>
<div class="row">
<div class="col-12">
<h4 class="mb-5">
<span class="text-top-title">Ожидаемые посылки</span>
</h4>
</div>
</div>
<section class="section section-inset-1">
<div class="container">
<div class="row">
<div class="col-xs-12 section-inset-1">
<div class="col-12">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-selected="true">Ожидаются <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="false">На складе <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">На упаковке <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-sent-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Отправленные <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-delivered-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Доставленные <span class="badge badge-pill badge-primary">0</span></a>
</div>
</nav>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="table-responsive">
<table class="table table-bordered text-left table-primary table-hover">
<table class="table table-hover bg-white border-1 shadow-sm">
<thead>
<tr class="bg-dark">
<tr>
<th>Tracking ID</th>
<th>Name</th>
<th>Status</th>
<th>Parcel weight</th>
<th>Total Items</th>
<th>Total Price</th>
<th>Название</th>
<th>Статус</th>
<th>Вес</th>
<th>Количество</th>
<th>Общая стоимость</th>
<th>Manage</th>
</tr>
</thead>
<tbody>
@foreach($units as $unit)
@foreach($packages as $unit)
<tr>
<td>{{ $unit->track_number }}</td>
<td><a href="#">{{ $unit->package_name }}</a></td>
......@@ -48,7 +62,7 @@
</div>
<!-- RD Mailform-->
<a href="/packages/addr" class="btn btn-primary btn-xs pull-sm-right btn-shadow" >Add Order</a>
<a href="/packages/addr" class="btn btn-primary shadow" >Добавить посылку</a>
</div>
</div>
......
resources/views/pages/parcels/packages_inwarehouse.blade.php 0 → 100644
View file @ 898273e7
@extends('layouts.user_new')
@section('content')
<div class="row">
<div class="col-12">
<h4 class="mb-5">
<span class="text-top-title">Посылки на складе</span>
</h4>
</div>
</div>
<section class="section section-inset-1">
<div class="container">
<div class="row">
<div class="col-12">
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-selected="false">Ожидаются <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link active" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-selected="true">На складе <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">На упаковке <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-sent-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Отправленные <span class="badge badge-pill badge-primary">0</span></a>
<a class="nav-item nav-link" id="nav-delivered-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-selected="false">Доставленные <span class="badge badge-pill badge-primary">0</span></a>
</div>
</nav>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="table-responsive">
<form action="{{ url('/packages/warehouse') }}" method="post" novalidate>
{{ csrf_field() }}
<table class="table table-light table-hover table-bordered table-sm">
<thead class="">
<tr>
<th>-</th>
<th>№</th>
<th>Статус</th>
<th>Трек №</th>
<th>Количество товаров</th>
<th>Стоимость товаров</th>
<th>Вес</th>
<th>Стоимость доставки</th>
</tr>
</thead>
<tbody>
@foreach($packages as $package)
<tr>
<td class="text-center"><input type="checkbox" name="packages2pack[]" value="{{ $package->id }}"> </td>
<td class="text-center">{{ $package->package_number() }}</td>
<td class="text-center"><span class="badge badge-primary">{{ \App\Models\Package::$statuses_descr[$package->status] }}</span></td>
<td><a href="#" class="text-info"> {{ $package->track_number }} </a></td>
<td class="d-flex justify-content-between align-items-center">
<span class="badge badge-primary badge-pill">{{ $package->total_items() }}</span>
<a href="#" onclick="showModal({{ $package->id }})">Декларация</a>
</td>
<td class="text-center">${{ $package->items_cost() }}</td>
<td class="text-center">{{ $package->items_weight() }} кг</td>
<td class="text-center">{{ $package->delivery_cost }}</td>
</tr>
@endforeach
</tbody>
</table>
<input type="submit" class="btn btn-success mb-5 mt-4" value="Отправить на упаковку" />
</form>
</div>
<!-- RD Mailform-->
<h5>Обозначение статусов:</h5>
<ul>
<li>Ожидаются - Посылка создана в системе, но еще не дошла до нашего склада.</li>
<li>На складе - Посылка находится на складе в Нью-Йорке.</li>
<li>На упаковке - Посылка проходит процесс упаковки и отправки.</li>
<li>Отправленные - Посылка находится в пути.</li>
<li>Доставленные - Посылка находится на складе в Ташкенте.</li>
</ul>
</div>
</div>
</div>
</section>
@endsection
resources/views/pages/parcels/packages_pending.blade.php 0 → 100644
View file @ 898273e7
<?php
/**
* Created by PhpStorm.
* User: RSkaldin
* Date: 6/15/2019
* Time: 2:24 AM
*/
\ No newline at end of file
resources/views/pages/profile/address_add.blade.php
View file @ 898273e7
......@@ -5,7 +5,7 @@
<div class="row">
<div class="col-12">
<h4 class="mb-5">
<span class="text-top-title">Редактирование профиля</span>
<span class="text-top-title">Добавление адреса</span>
</h4>
</div>
</div>
......@@ -118,7 +118,7 @@
</div>
</div>
<button class="btn btn-primary btn-sm mt-4" type="submit">Добавить Адрес</button>
<button class="btn btn-primary btn-sm mt-4 shadow" type="submit">Добавить Адрес</button>
</form>
</div>
@endsection
resources/views/pages/profile/addresses.blade.php
View file @ 898273e7
......@@ -6,7 +6,7 @@
<div class="row">
<div class="col-12">
<h4 class="mb-5">
<span class="text-top-title">Редактирование профиля</span>
<span class="text-top-title">Список ваших адресов</span>
</h4>
</div>
</div>
......@@ -32,32 +32,26 @@
<td>{{ $unit->firstname }} {{ $unit->lastname }}</td>
<td>{{ $unit->passport }}
</td>
<td>{{ $unit->address }}</td>
<td>{{ $unit->getFormated() }}</td>
<td>
{{ $unit->phone }}
</td>
<td>
<form action="{{ route('address.destroy',$device->id) }}" method="POST">
<a href="/address/{{$unit->id}}/edit" class="btn btn-warning btn-sm mb-1"> Редактировать</a>
<form action="{{ route('address.destroy', $unit->id) }}" method="POST">
@csrf
@method('DELETE')
<a href="/address/{{$unit->id}}/edit"><i class="fa fa-pencil"></i></a>
<button class="fa fa-times-circle" >
</button></form>
<button type="submit" class="btn btn-danger btn-sm" ><i class="fa fa-times-circle"></i> Удалить</button>
</form>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<!-- RD Mailform-->
<a class="btn btn-primary btn-sm pull-sm-right" href="{{ route('address.add') }}" >Добавить адрес</a>
<a class="btn btn-primary shadow" href="{{ route('address.add') }}" >Добавить адрес</a>
</div>
</div>
......
resources/views/pages/profile/profile_edit.blade.php
View file @ 898273e7
......@@ -62,7 +62,7 @@
</div>
<div class="form-group row mb-0">
<div class="col-md-6 offset-md-4">
<div class="col-md-6 offset-md-4 shadow">
<button type="submit" class="btn btn-primary">
Сохранить изменения
</button>
......
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