Skip to content

F
fazo
Commit 83d1b63e authored by Ruslan's avatar Ruslan
Browse files
Options

Implement parcels index page

parent 2c45105e
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 107 deletions
.idea/workspace.xml
View file @ 83d1b63e
......@@ -4,8 +4,7 @@
<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$/app/Http/Controllers/PackagesController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/addpackage.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/addpackage.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/user.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/user.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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -32,7 +31,7 @@
<entry key="css" value="3" />
<entry key="env" value="1" />
<entry key="ico" value="1" />
<entry key="php" value="89" />
<entry key="php" value="91" />
<entry key="png" value="4" />
<entry key="svg" value="1" />
<entry key="woff2" value="1" />
......@@ -40,10 +39,10 @@
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="Blade" value="40" />
<entry key="Blade" value="41" />
<entry key="CSS" value="3" />
<entry key="Image" value="5" />
<entry key="PHP" value="49" />
<entry key="PHP" value="50" />
<entry key="PLAIN_TEXT" value="2" />
<entry key="SVG" value="1" />
</counts>
......@@ -52,14 +51,14 @@
<counts>
<entry key="css" value="12" />
<entry key="env" value="15" />
<entry key="php" value="15130" />
<entry key="php" value="15266" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Blade" value="8563" />
<entry key="Blade" value="8666" />
<entry key="CSS" value="12" />
<entry key="PHP" value="6567" />
<entry key="PHP" value="6600" />
<entry key="PLAIN_TEXT" value="15" />
</counts>
</usages-collector>
......@@ -70,8 +69,8 @@
<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="239">
<caret line="40" column="53" selection-start-line="40" selection-start-column="49" selection-end-line="40" selection-end-column="53" />
<state relative-caret-position="364">
<caret line="41" column="49" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="49" />
</state>
</provider>
</entry>
......@@ -79,48 +78,48 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
<caret line="224" column="25" selection-start-line="224" selection-start-column="25" selection-end-line="224" selection-end-column="25" />
<state relative-caret-position="663">
<caret line="229" column="21" lean-forward="true" selection-start-line="229" selection-start-column="21" selection-end-line="229" selection-end-column="21" />
</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$/app/Models/Package.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="45" column="16" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
<state relative-caret-position="378">
<caret line="51" column="31" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.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="18">
<caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="62" />
<folding>
<element signature="n#link#5;n#head#0;n#html#0;n#!!top" />
<marker date="1560276372574" expanded="true" signature="1184:1238" ph="..." />
</folding>
<state relative-caret-position="424">
<caret line="33" column="59" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/pages/profile/profile_edit.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1098">
<caret line="61" column="21" selection-start-line="61" selection-start-column="21" selection-end-line="61" selection-end-column="21" />
<state relative-caret-position="357">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
</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/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="28" lean-forward="true" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
<state relative-caret-position="406">
<caret line="45" column="26" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
<folding>
<element signature="n#link#5;n#head#0;n#html#0;n#!!top" />
<marker date="1560289990171" expanded="true" signature="1184:1238" ph="..." />
</folding>
</state>
</provider>
</entry>
......@@ -128,8 +127,8 @@
<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="1116">
<caret line="62" column="63" selection-start-line="62" selection-start-column="63" selection-end-line="62" selection-end-column="63" />
<state relative-caret-position="935">
<caret line="55" column="38" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="38" />
</state>
</provider>
</entry>
......@@ -137,8 +136,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="258" column="26" selection-start-line="258" selection-start-column="26" selection-end-line="258" selection-end-column="26" />
<state relative-caret-position="465">
<caret line="303" column="58" lean-forward="true" selection-start-line="303" selection-start-column="58" selection-end-line="303" selection-end-column="58" />
</state>
</provider>
</entry>
......@@ -146,8 +145,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/address.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
<state relative-caret-position="306">
<caret line="18" column="45" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
</state>
</provider>
</entry>
......@@ -155,7 +154,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<state relative-caret-position="221">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
</state>
</provider>
......@@ -187,9 +186,9 @@
<find>/feedback/add</find>
<find>fa-pinterest-p</find>
<find>save</find>
<find>address</find>
<find>Адреса</find>
<find>profile</find>
<find>address</find>
<find>addr</find>
</findStrings>
<replaceStrings>
......@@ -239,9 +238,10 @@
<option value="$PROJECT_DIR$/resources/views/pages/profile/user.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ProfileController.php" />
<option value="$PROJECT_DIR$/routes/web.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/user.blade.php" />
<option value="$PROJECT_DIR$/resources/views/addpackage.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PackagesController.php" />
<option value="$PROJECT_DIR$/resources/views/pages/parcels/index.blade.php" />
</list>
</option>
</component>
......@@ -352,10 +352,9 @@
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="2127" />
<option name="y" value="152" />
<option name="width" value="1616" />
<option name="height" value="820" />
<option name="x" value="1913" />
<option name="width" value="1023" />
<option name="height" value="1047" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
......@@ -427,6 +426,22 @@
<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="packages" 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="parcels" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="fazoshop" type="b2602c69:ProjectViewProjectNode" />
<item name="fazoshop" type="462c0819:PsiDirectoryNode" />
......@@ -450,7 +465,7 @@
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
......@@ -487,17 +502,18 @@
<workItem from="1559392286763" duration="1822000" />
<workItem from="1559405496483" duration="10478000" />
<workItem from="1560035206797" duration="23000" />
<workItem from="1560092291448" duration="20869000" />
<workItem from="1560092291448" duration="23439000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="95066000" />
<option name="totallyTimeSpent" value="97636000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24946696" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17910448" />
<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" />
......@@ -510,7 +526,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 active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" visible="true" weight="0.20607375" />
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49932885" weight="0.16594361" />
<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" />
......@@ -628,13 +644,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Models/Package.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="17" column="65" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Postman/DeclarationController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
......@@ -731,9 +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" />
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/pages/tarifs/index.blade.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
......@@ -841,75 +847,89 @@
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/profile.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="28" lean-forward="true" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
<state relative-caret-position="595">
<caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
</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="1098">
<state relative-caret-position="1037">
<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/pages/profile/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1116">
<caret line="62" column="63" selection-start-line="62" selection-start-column="63" selection-end-line="62" selection-end-column="63" />
<state relative-caret-position="935">
<caret line="55" column="38" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<entry file="file://$PROJECT_DIR$/resources/views/address.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" column="45" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="258" column="26" selection-start-line="258" selection-start-column="26" selection-end-line="258" selection-end-column="26" />
<state relative-caret-position="221">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/address.blade.php">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="406">
<caret line="45" column="26" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
<folding>
<element signature="n#link#5;n#head#0;n#html#0;n#!!top" />
<marker date="1560289990171" expanded="true" signature="1184:1238" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
<state relative-caret-position="357">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/web.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="40" column="53" selection-start-line="40" selection-start-column="49" selection-end-line="40" selection-end-column="53" />
<state relative-caret-position="364">
<caret line="41" column="49" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
<caret line="224" column="25" selection-start-line="224" selection-start-column="25" selection-end-line="224" selection-end-column="25" />
<state relative-caret-position="465">
<caret line="303" column="58" lean-forward="true" selection-start-line="303" selection-start-column="58" selection-end-line="303" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/addpackage.blade.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/PackagesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="45" column="16" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
<state relative-caret-position="663">
<caret line="229" column="21" lean-forward="true" selection-start-line="229" selection-start-column="21" selection-end-line="229" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/app.blade.php">
<entry file="file://$PROJECT_DIR$/app/Models/Package.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="13" column="61" selection-start-line="13" selection-end-line="14" />
<state relative-caret-position="378">
<caret line="51" column="31" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/user.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="18">
<caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="62" />
<folding>
<element signature="n#link#5;n#head#0;n#html#0;n#!!top" />
<marker date="1560276372574" expanded="true" signature="1184:1238" ph="..." />
</folding>
<state relative-caret-position="424">
<caret line="33" column="59" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" />
</state>
</provider>
</entry>
......
app/Http/Controllers/PackagesController.php
View file @ 83d1b63e
......@@ -227,9 +227,7 @@ class PackagesController extends Controller
public function index()
{
$units = Package::where('user_id', '=', Auth::user()->id);
$units = Package::where('user_id', '=', Auth::user()->id)->get();
return view('pages.parcels.index', compact('units'));
}
}
resources/views/pages/parcels/index.blade.php
View file @ 83d1b63e
......@@ -12,7 +12,7 @@
<div class="row">
<div class="col-xs-12 section-inset-1">
<div class="table-responsive">
<table class="table table-hover text-left">
<table class="table table-bordered text-left table-primary table-hover">
<thead>
<tr class="bg-dark">
<th>Tracking ID</th>
......@@ -27,34 +27,28 @@
<tbody>
@foreach($units as $unit)
<tr>
<td>{{ $unit->tracking_number }}</td>
<td><a href="#">{{ $unit->name }}</a></td>
<td><p class="font-secondary h6">{{ $unit->status }}</p>
</td>
<td>{{ $unit->weight }}</td>
<td>
<label>
{{--{{ $unit->items->count() }}--}}
</label>
</form>
</td>
<td>${{ $unit->price }}</td>
<td>{{ $unit->track_number }}</td>
<td><a href="#">{{ $unit->package_name }}</a></td>
<td><b>{{ $unit->status }}</b></td>
<td>{{ $unit->items_weight() }}</td>
<td>{{ $unit->total_items() }}</td>
<td>${{ $unit->items_cost() }}</td>
<td>
@if($unit->status == 1)
<i class="fa fa-money"></i>
<span class="icon icon-xs fa fa-money"></span>
@endif
<i class="fa fa-pencil"></i>
<i class="fa fa-times-circle"></i>
<span class="icon icon-xs fa fa-pencil"></span>
<span class="icon icon-xs fa fa-times-circle"></span>
</td>
</tr>
@endforeach
</tr>
</tbody>
</table>
</div>
<!-- RD Mailform-->
<a href="/packages/addr" class="btn btn-primary btn-sm pull-sm-right" >Add Order</a>
<a href="/packages/addr" class="btn btn-primary btn-xs pull-sm-right btn-shadow" >Add Order</a>
</div>
</div>
......
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