merge with august_spring
This commit is contained in:
Yan
258
.idea/workspace.xml
generated
258
.idea/workspace.xml
generated
@@ -3,17 +3,14 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
|
<list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.rdb" afterPath="$PROJECT_DIR$/dump.rdb" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.rdb" afterPath="$PROJECT_DIR$/dump.rdb" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/sxrestaurant.iml" afterPath="$PROJECT_DIR$/.idea/sxrestaurant.iml" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/javascripts/application.js" afterPath="$PROJECT_DIR$/app/assets/javascripts/application.js" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/stylesheets/application.scss" afterPath="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
|
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/_form.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_form.html.erb" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/index.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/index.html.erb" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/promotions/new.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/promotions/new.html.erb" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/new.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/new.html.erb" />
|
||||||
</list>
|
</list>
|
||||||
<ignored path="$PROJECT_DIR$/.bundle/" />
|
<ignored path="$PROJECT_DIR$/.bundle/" />
|
||||||
<ignored path="$PROJECT_DIR$/components/" />
|
<ignored path="$PROJECT_DIR$/components/" />
|
||||||
@@ -28,7 +25,7 @@
|
|||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="CoverageDataManager">
|
<component name="CoverageDataManager">
|
||||||
<SUITE FILE_PATH="coverage/sxrestaurant@Development__sxrestaurant.coverage" NAME="Development: sxrestaurant Coverage Results" MODIFIED="1504066113816" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
|
<SUITE FILE_PATH="coverage/sxrestaurant@Development__sxrestaurant.coverage" NAME="Development: sxrestaurant Coverage Results" MODIFIED="1504066735497" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
|
||||||
<SUITE FILE_PATH="coverage/sxrestaurant@db_migrate__sxrestaurant.coverage" NAME="db:migrate: sxrestaurant Coverage Results" MODIFIED="1503652404616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
|
<SUITE FILE_PATH="coverage/sxrestaurant@db_migrate__sxrestaurant.coverage" NAME="db:migrate: sxrestaurant Coverage Results" MODIFIED="1503652404616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
|
||||||
<SUITE FILE_PATH="coverage/sxrestaurant@Rails_console__sxrestaurant.coverage" NAME="Rails console: sxrestaurant Coverage Results" MODIFIED="1503651318886" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
|
<SUITE FILE_PATH="coverage/sxrestaurant@Rails_console__sxrestaurant.coverage" NAME="Rails console: sxrestaurant Coverage Results" MODIFIED="1503651318886" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
|
||||||
</component>
|
</component>
|
||||||
@@ -55,41 +52,51 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||||
<file leaf-file-name="in_juties_controller.rb" pinned="false" current-in-tab="false">
|
<file leaf-file-name="in_juties_controller.rb" pinned="false" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
|
<entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="93">
|
<state relative-caret-position="452">
|
||||||
<caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
|
<caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
|
<file leaf-file-name="_assign_in_juty.html.erb" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/settings/promotions/_form.html.erb">
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="-1366">
|
<state relative-caret-position="-294">
|
||||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
<caret line="1" column="38" lean-forward="true" selection-start-line="1" selection-start-column="38" selection-end-line="1" selection-end-column="38" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">
|
<file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/settings/promotions/new.html.erb">
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/new.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="234">
|
<state relative-caret-position="144">
|
||||||
<caret line="13" column="33" lean-forward="true" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
|
<caret line="8" column="55" lean-forward="false" selection-start-line="8" selection-start-column="55" selection-end-line="8" selection-end-column="55" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="_assign_in_juty.html.erb" pinned="false" current-in-tab="true">
|
<file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb">
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_form.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="197">
|
<state relative-caret-position="68">
|
||||||
<caret line="15" column="133" lean-forward="false" selection-start-line="15" selection-start-column="133" selection-end-line="15" selection-end-column="133" />
|
<caret line="15" column="54" lean-forward="false" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="_edit_in_juty.html.erb" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="198">
|
||||||
|
<caret line="11" column="29" lean-forward="true" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@@ -98,42 +105,23 @@
|
|||||||
<file leaf-file-name="index_in_juty.html.erb" pinned="false" current-in-tab="false">
|
<file leaf-file-name="index_in_juty.html.erb" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="836">
|
<state relative-caret-position="194">
|
||||||
<caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
|
<caret line="38" column="14" lean-forward="false" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/Gemfile">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="12">
|
|
||||||
<caret line="93" column="10" lean-forward="false" selection-start-line="93" selection-start-column="10" selection-end-line="93" selection-end-column="10" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="application.js" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/assets/javascripts/application.js">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="342">
|
|
||||||
<caret line="25" column="33" lean-forward="false" selection-start-line="25" selection-start-column="33" selection-end-line="25" selection-end-column="33" />
|
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="n#!!doc" expanded="true" />
|
<element signature="e#1270#1276#0#HTML" expanded="true" />
|
||||||
<marker date="1504065881000" expanded="true" signature="2006:2033" ph="..." />
|
<element signature="e#1276#1282#0#HTML" expanded="true" />
|
||||||
<marker date="1504065881000" expanded="true" signature="2829:2856" ph="..." />
|
<element signature="e#1370#1376#0#HTML" expanded="true" />
|
||||||
|
<element signature="e#1376#1382#0#HTML" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="application.scss" pinned="false" current-in-tab="false">
|
<file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.scss">
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="144">
|
<state relative-caret-position="142">
|
||||||
<caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
|
<caret line="56" column="21" lean-forward="true" selection-start-line="56" selection-start-column="12" selection-end-line="56" selection-end-column="21" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@@ -173,10 +161,6 @@
|
|||||||
<component name="IdeDocumentHistory">
|
<component name="IdeDocumentHistory">
|
||||||
<option name="CHANGED_PATHS">
|
<option name="CHANGED_PATHS">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/db/migrate/20170823075203_create_in_juties.rb" />
|
|
||||||
<option value="$PROJECT_DIR$/db/migrate/20170823081747_create_in_juties.rb" />
|
|
||||||
<option value="$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
|
|
||||||
<option value="$PROJECT_DIR$/app/views/origami/home/index_bk.html.erb" />
|
|
||||||
<option value="$PROJECT_DIR$/db/migrate/20170822034139_create_product_commissions.rb" />
|
<option value="$PROJECT_DIR$/db/migrate/20170822034139_create_product_commissions.rb" />
|
||||||
<option value="$PROJECT_DIR$/db/migrate/20170823034140_create_product_commissions.rb" />
|
<option value="$PROJECT_DIR$/db/migrate/20170823034140_create_product_commissions.rb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/origami/commissions/_commissioners.html.erb" />
|
||||||
@@ -217,13 +201,17 @@
|
|||||||
<option value="$PROJECT_DIR$/Gemfile.lock" />
|
<option value="$PROJECT_DIR$/Gemfile.lock" />
|
||||||
<option value="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" />
|
<option value="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" />
|
||||||
<option value="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
|
|
||||||
<option value="$PROJECT_DIR$/Gemfile" />
|
<option value="$PROJECT_DIR$/Gemfile" />
|
||||||
<option value="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
|
|
||||||
<option value="$PROJECT_DIR$/app/assets/javascripts/application.js" />
|
<option value="$PROJECT_DIR$/app/assets/javascripts/application.js" />
|
||||||
<option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
|
<option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
|
||||||
<option value="$PROJECT_DIR$/app/views/settings/promotions/new.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/settings/promotions/new.html.erb" />
|
||||||
<option value="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
|
<option value="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
|
||||||
|
<option value="$PROJECT_DIR$/app/views/origami/in_juties/new.html.erb" />
|
||||||
|
<option value="$PROJECT_DIR$/app/views/origami/in_juties/index.html.erb" />
|
||||||
|
<option value="$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb" />
|
||||||
|
<option value="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
|
||||||
|
<option value="$PROJECT_DIR$/app/views/origami/in_juties/_form.html.erb" />
|
||||||
|
<option value="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
@@ -756,12 +744,12 @@
|
|||||||
<workItem from="1503457057830" duration="7166000" />
|
<workItem from="1503457057830" duration="7166000" />
|
||||||
<workItem from="1503472116907" duration="50209000" />
|
<workItem from="1503472116907" duration="50209000" />
|
||||||
<workItem from="1503843212665" duration="21267000" />
|
<workItem from="1503843212665" duration="21267000" />
|
||||||
<workItem from="1503909487511" duration="36125000" />
|
<workItem from="1503909487511" duration="50516000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="188743000" />
|
<option name="totallyTimeSpent" value="203134000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="TodoView">
|
<component name="TodoView">
|
||||||
<todo-panel id="selected-file">
|
<todo-panel id="selected-file">
|
||||||
@@ -774,7 +762,6 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="1440" y="22" width="1920" height="1058" extended-state="6" />
|
<frame x="1440" y="22" width="1920" height="1058" extended-state="6" />
|
||||||
<editor active="true" />
|
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20181043" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20181043" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917964" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917964" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
@@ -784,9 +771,9 @@
|
|||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48701972" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48701972" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3759086" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3759086" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.49013498" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34994808" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3561786" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3561786" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||||
@@ -804,51 +791,11 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
<option name="time" value="25" />
|
<option name="time" value="40" />
|
||||||
</breakpoint-manager>
|
</breakpoint-manager>
|
||||||
<watches-manager />
|
<watches-manager />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="269">
|
|
||||||
<caret line="579" column="40" lean-forward="false" selection-start-line="579" selection-start-column="33" selection-end-line="579" selection-end-column="40" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/assets/stylesheets/origami.scss">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="386">
|
|
||||||
<caret line="176" column="16" lean-forward="true" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/assets/stylesheets/settings.scss">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="653">
|
|
||||||
<caret line="89" column="16" lean-forward="false" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/settings/commissions_controller.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="368">
|
|
||||||
<caret line="76" column="12" lean-forward="true" selection-start-line="76" selection-start-column="12" selection-end-line="76" selection-end-column="12" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/origami/product_commissions_controller.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="164">
|
|
||||||
<caret line="65" column="12" lean-forward="true" selection-start-line="65" selection-start-column="12" selection-end-line="65" selection-end-column="12" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/reports/bksaleitem_controller.rb">
|
<entry file="file://$PROJECT_DIR$/app/controllers/reports/bksaleitem_controller.rb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="0">
|
<state relative-caret-position="0">
|
||||||
@@ -1088,7 +1035,7 @@
|
|||||||
<state relative-caret-position="126">
|
<state relative-caret-position="126">
|
||||||
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
|
<element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="false" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@@ -1106,7 +1053,7 @@
|
|||||||
<state relative-caret-position="412">
|
<state relative-caret-position="412">
|
||||||
<caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
|
<caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#3;n#!!top" expanded="true" />
|
<element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#3;n#!!top" expanded="false" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@@ -1151,18 +1098,18 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/settings/promotions/_form.html.erb">
|
<entry file="file://$PROJECT_DIR$/Gemfile">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="-1366">
|
<state relative-caret-position="12">
|
||||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
<caret line="93" column="10" lean-forward="false" selection-start-line="93" selection-start-column="10" selection-end-line="93" selection-end-column="10" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/settings/promotions/new.html.erb">
|
<entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.scss">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="234">
|
<state relative-caret-position="144">
|
||||||
<caret line="13" column="33" lean-forward="true" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
|
<caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@@ -1179,42 +1126,87 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.scss">
|
<entry file="file://$PROJECT_DIR$/app/views/settings/promotions/new.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="234">
|
||||||
|
<caret line="13" column="33" lean-forward="true" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/settings/promotions/_form.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="-1395">
|
||||||
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/new.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="144">
|
<state relative-caret-position="144">
|
||||||
<caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
|
<caret line="8" column="55" lean-forward="false" selection-start-line="8" selection-start-column="55" selection-end-line="8" selection-end-column="55" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Gemfile">
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index.html.erb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="12">
|
<state relative-caret-position="142">
|
||||||
<caret line="93" column="10" lean-forward="false" selection-start-line="93" selection-start-column="10" selection-end-line="93" selection-end-column="10" />
|
<caret line="56" column="21" lean-forward="true" selection-start-line="56" selection-start-column="12" selection-end-line="56" selection-end-column="21" />
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="836">
|
|
||||||
<caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="93">
|
|
||||||
<caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
|
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb">
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="-294">
|
||||||
|
<caret line="1" column="38" lean-forward="true" selection-start-line="1" selection-start-column="38" selection-end-line="1" selection-end-column="38" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_edit_in_juty.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="198">
|
||||||
|
<caret line="11" column="29" lean-forward="true" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="194">
|
||||||
|
<caret line="38" column="14" lean-forward="false" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#1270#1276#0#HTML" expanded="true" />
|
||||||
|
<element signature="e#1276#1282#0#HTML" expanded="true" />
|
||||||
|
<element signature="e#1370#1376#0#HTML" expanded="true" />
|
||||||
|
<element signature="e#1376#1382#0#HTML" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_form.html.erb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="68">
|
||||||
|
<caret line="15" column="54" lean-forward="false" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/activesupport-5.1.3/lib/active_support/callbacks.rb">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="197">
|
<state relative-caret-position="197">
|
||||||
<caret line="15" column="133" lean-forward="false" selection-start-line="15" selection-start-column="133" selection-end-line="15" selection-end-column="133" />
|
<caret line="131" column="0" lean-forward="false" selection-start-line="131" selection-start-column="0" selection-end-line="131" selection-end-column="0" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="452">
|
||||||
|
<caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
class Inventory::InventoryController < BaseInventoryController
|
class Inventory::InventoryController < BaseInventoryController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
|
@products = InventoryDefinition.all.active.order('created_at desc')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
|
|||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @inventory_definition.save
|
if @inventory_definition.save
|
||||||
format.html { redirect_to @inventory_definition, notice: 'Inventory definition was successfully created.' }
|
format.html { redirect_to inventory_path, notice: 'Inventory definition was successfully created.' }
|
||||||
format.json { render :show, status: :created, location: @inventory_definition }
|
format.json { render :show, status: :created, location: @inventory_definition }
|
||||||
else
|
else
|
||||||
format.html { render :new }
|
format.html { render :new }
|
||||||
@@ -69,6 +69,6 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
|
|||||||
|
|
||||||
# Never trust parameters from the scary internet, only allow the white list through.
|
# Never trust parameters from the scary internet, only allow the white list through.
|
||||||
def inventory_definition_params
|
def inventory_definition_params
|
||||||
params.fetch(:inventory_definition, {})
|
params.require(:inventory_definition).permit(:item_code, :min_order_level, :max_stock_level)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
class StockCheckItemsController < ApplicationController
|
class Inventory::StockCheckItemsController < BaseInventoryController
|
||||||
before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy]
|
before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy]
|
||||||
|
|
||||||
# GET /stock_check_items
|
# GET /stock_check_items
|
||||||
@@ -28,7 +28,7 @@ class StockCheckItemsController < ApplicationController
|
|||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @stock_check_item.save
|
if @stock_check_item.save
|
||||||
format.html { redirect_to @stock_check_item, notice: 'Stock check item was successfully created.' }
|
format.html { redirect_to inventory_stock_checks_path, notice: 'Stock check item was successfully created.' }
|
||||||
format.json { render :show, status: :created, location: @stock_check_item }
|
format.json { render :show, status: :created, location: @stock_check_item }
|
||||||
else
|
else
|
||||||
format.html { render :new }
|
format.html { render :new }
|
||||||
@@ -69,6 +69,6 @@ class StockCheckItemsController < ApplicationController
|
|||||||
|
|
||||||
# Never trust parameters from the scary internet, only allow the white list through.
|
# Never trust parameters from the scary internet, only allow the white list through.
|
||||||
def stock_check_item_params
|
def stock_check_item_params
|
||||||
params.fetch(:stock_check_item, {})
|
params.require(:stock_check_item).permit(:item_code, :stock_count)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,74 +1,98 @@
|
|||||||
class StockChecksController < ApplicationController
|
class Inventory::StockChecksController < BaseInventoryController
|
||||||
before_action :set_stock_check, only: [:show, :edit, :update, :destroy]
|
|
||||||
|
def index
|
||||||
|
@check = StockCheck.new
|
||||||
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
item_list = JSON.parse(params[:stock_item])
|
||||||
|
reason = params[:reason]
|
||||||
|
check = StockCheck.new
|
||||||
|
@check = check.create(current_user, reason, item_list)
|
||||||
|
end
|
||||||
|
|
||||||
|
def show
|
||||||
|
@check = StockCheck.find(params[:id])
|
||||||
|
end
|
||||||
|
|
||||||
|
def save_to_journal
|
||||||
|
check = params[:data]
|
||||||
|
stockCheck = StockCheck.find(check)
|
||||||
|
stockCheck.stock_check_items.each do |item|
|
||||||
|
StockJournal.from_stock_check(item)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# before_action :set_stock_check, only: [:show, :edit, :update, :destroy]
|
||||||
|
|
||||||
# GET /stock_checks
|
# GET /stock_checks
|
||||||
# GET /stock_checks.json
|
# GET /stock_checks.json
|
||||||
def index
|
# def index
|
||||||
@stock_checks = StockCheck.all
|
# @stock_checks = StockCheck.all
|
||||||
end
|
# end
|
||||||
|
#
|
||||||
# GET /stock_checks/1
|
# # GET /stock_checks/1
|
||||||
# GET /stock_checks/1.json
|
# # GET /stock_checks/1.json
|
||||||
def show
|
# def show
|
||||||
end
|
# end
|
||||||
|
#
|
||||||
# GET /stock_checks/new
|
# # GET /stock_checks/new
|
||||||
def new
|
# def new
|
||||||
@stock_check = StockCheck.new
|
# @stock_check = StockCheck.new
|
||||||
end
|
# end
|
||||||
|
#
|
||||||
# GET /stock_checks/1/edit
|
# # GET /stock_checks/1/edit
|
||||||
def edit
|
# def edit
|
||||||
end
|
# end
|
||||||
|
#
|
||||||
# POST /stock_checks
|
# # POST /stock_checks
|
||||||
# POST /stock_checks.json
|
# # POST /stock_checks.json
|
||||||
def create
|
# def create
|
||||||
@stock_check = StockCheck.new(stock_check_params)
|
# @stock_check = StockCheck.new(stock_check_params)
|
||||||
|
#
|
||||||
respond_to do |format|
|
# respond_to do |format|
|
||||||
if @stock_check.save
|
# if @stock_check.save
|
||||||
format.html { redirect_to @stock_check, notice: 'Stock check was successfully created.' }
|
# format.html { redirect_to @stock_check, notice: 'Stock check was successfully created.' }
|
||||||
format.json { render :show, status: :created, location: @stock_check }
|
# format.json { render :show, status: :created, location: @stock_check }
|
||||||
else
|
# else
|
||||||
format.html { render :new }
|
# format.html { render :new }
|
||||||
format.json { render json: @stock_check.errors, status: :unprocessable_entity }
|
# format.json { render json: @stock_check.errors, status: :unprocessable_entity }
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
|
#
|
||||||
# PATCH/PUT /stock_checks/1
|
# # PATCH/PUT /stock_checks/1
|
||||||
# PATCH/PUT /stock_checks/1.json
|
# # PATCH/PUT /stock_checks/1.json
|
||||||
def update
|
# def update
|
||||||
respond_to do |format|
|
# respond_to do |format|
|
||||||
if @stock_check.update(stock_check_params)
|
# if @stock_check.update(stock_check_params)
|
||||||
format.html { redirect_to @stock_check, notice: 'Stock check was successfully updated.' }
|
# format.html { redirect_to @stock_check, notice: 'Stock check was successfully updated.' }
|
||||||
format.json { render :show, status: :ok, location: @stock_check }
|
# format.json { render :show, status: :ok, location: @stock_check }
|
||||||
else
|
# else
|
||||||
format.html { render :edit }
|
# format.html { render :edit }
|
||||||
format.json { render json: @stock_check.errors, status: :unprocessable_entity }
|
# format.json { render json: @stock_check.errors, status: :unprocessable_entity }
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
|
#
|
||||||
# DELETE /stock_checks/1
|
# # DELETE /stock_checks/1
|
||||||
# DELETE /stock_checks/1.json
|
# # DELETE /stock_checks/1.json
|
||||||
def destroy
|
# def destroy
|
||||||
@stock_check.destroy
|
# @stock_check.destroy
|
||||||
respond_to do |format|
|
# respond_to do |format|
|
||||||
format.html { redirect_to stock_checks_url, notice: 'Stock check was successfully destroyed.' }
|
# format.html { redirect_to stock_checks_url, notice: 'Stock check was successfully destroyed.' }
|
||||||
format.json { head :no_content }
|
# format.json { head :no_content }
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
|
#
|
||||||
private
|
# private
|
||||||
# Use callbacks to share common setup or constraints between actions.
|
# # Use callbacks to share common setup or constraints between actions.
|
||||||
def set_stock_check
|
# def set_stock_check
|
||||||
@stock_check = StockCheck.find(params[:id])
|
# @stock_check = StockCheck.find(params[:id])
|
||||||
end
|
# end
|
||||||
|
#
|
||||||
# Never trust parameters from the scary internet, only allow the white list through.
|
# # Never trust parameters from the scary internet, only allow the white list through.
|
||||||
def stock_check_params
|
# def stock_check_params
|
||||||
params.fetch(:stock_check, {})
|
# params.fetch(:stock_check, {})
|
||||||
end
|
# end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
class Origami::InJutiesController < BaseOrigamiController
|
class Origami::InJutiesController < BaseOrigamiController
|
||||||
before_action :set_in_juty, only: [:show, :edit, :update, :edit_in_juty, :update_for_in_juty , :destroy ,:destroy_in_juty]
|
before_action :set_in_juty, only: %i[show edit update edit_in_juty update_for_in_juty destroy destroy_in_juty]
|
||||||
|
|
||||||
# GET /in_juties
|
# GET /in_juties
|
||||||
# GET /in_juties.json
|
# GET /in_juties.json
|
||||||
@@ -8,11 +8,12 @@ class Origami::InJutiesController < BaseOrigamiController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def index_in_juty
|
def index_in_juty
|
||||||
@juty_in= InJuty.where("dinning_id=?",params[:table_id])
|
@juty_in = InJuty.where('dinning_id=?', params[:table_id])
|
||||||
@table = DiningFacility.find(params[:table_id])
|
@table = DiningFacility.find(params[:table_id])
|
||||||
@in_juty = InJuty.new
|
@in_juty = InJuty.new
|
||||||
@juties_in = Kaminari.paginate_array(@juty_in).page(params[:page]).per(10)
|
@juties_in = Kaminari.paginate_array(@juty_in).page(params[:page]).per(10)
|
||||||
end
|
end
|
||||||
|
|
||||||
# GET /in_juties/1
|
# GET /in_juties/1
|
||||||
# GET /in_juties/1.json
|
# GET /in_juties/1.json
|
||||||
def show
|
def show
|
||||||
@@ -20,12 +21,15 @@ class Origami::InJutiesController < BaseOrigamiController
|
|||||||
|
|
||||||
# GET /in_juties/new
|
# GET /in_juties/new
|
||||||
def new
|
def new
|
||||||
|
# this one use for new
|
||||||
@in_juty = InJuty.new
|
@in_juty = InJuty.new
|
||||||
|
@table = DiningFacility.find(params[:table_id])
|
||||||
|
@commissioner = @in_juty.commissioner
|
||||||
|
render partial: 'form'
|
||||||
end
|
end
|
||||||
|
|
||||||
# GET /in_juties/1/edit
|
# GET /in_juties/1/edit
|
||||||
def edit
|
def edit
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit_in_juty
|
def edit_in_juty
|
||||||
@@ -33,13 +37,15 @@ class Origami::InJutiesController < BaseOrigamiController
|
|||||||
@table = DiningFacility.find(params[:table_id])
|
@table = DiningFacility.find(params[:table_id])
|
||||||
@commissioner = @in_juty.commissioner
|
@commissioner = @in_juty.commissioner
|
||||||
|
|
||||||
render json: {in_juty: @in_juty, commissioner: @commissioner}
|
# render json: {in_juty: @in_juty, commissioner: @commissioner}
|
||||||
|
render partial: 'form'
|
||||||
end
|
end
|
||||||
|
|
||||||
def assign_in_juty
|
def assign_in_juty
|
||||||
@in_juty = InJuty.new
|
@in_juty = InJuty.new
|
||||||
@table = DiningFacility.find(params[:table_id])
|
@table = DiningFacility.find(params[:table_id])
|
||||||
end
|
end
|
||||||
|
|
||||||
# POST /in_juties
|
# POST /in_juties
|
||||||
# POST /in_juties.json
|
# POST /in_juties.json
|
||||||
def create
|
def create
|
||||||
@@ -57,32 +63,53 @@ class Origami::InJutiesController < BaseOrigamiController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def create_for_in_juty
|
def create_for_in_juty
|
||||||
|
# this one use for create and update
|
||||||
|
in_juty = in_juty_params
|
||||||
|
in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i
|
||||||
|
in_time = in_time.change(offset: '+06:30')
|
||||||
|
out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i
|
||||||
|
out_time = out_time.change(offset: '+06:30')
|
||||||
@in_juty = InJuty.new
|
@in_juty = InJuty.new
|
||||||
|
in_juty_id = in_juty[:id]
|
||||||
|
unless in_juty_id.nil?
|
||||||
|
@in_juty = InJuty.find(in_juty_id.to_i)
|
||||||
|
end
|
||||||
|
|
||||||
@in_juty.dinning_id = in_juty_params[:dinning_id]
|
@in_juty.dinning_id = in_juty_params[:dinning_id]
|
||||||
@in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
|
@in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
|
||||||
@in_juty.in_time = in_juty_params[:in_time]
|
@in_juty.in_time = in_time
|
||||||
@in_juty.out_time = in_juty_params[:out_time]
|
@in_juty.out_time = out_time
|
||||||
|
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @in_juty.save
|
if @in_juty.save
|
||||||
format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully created.' }
|
if in_juty_id.nil?
|
||||||
format.json { render :show, status: :created, location: @in_juty }
|
format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully created.' }
|
||||||
|
format.json { render :show, status: :created, location: @in_juty }
|
||||||
|
else
|
||||||
|
format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' }
|
||||||
|
format.json { render :show, status: :created, location: @in_juty }
|
||||||
|
end
|
||||||
else
|
else
|
||||||
format.html { render :new }
|
format.html { render :new }
|
||||||
format.json { render json: @in_juty.errors, status: :unprocessable_entity }
|
format.json { render json: @in_juty.errors, status: :unprocessable_entity }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# PATCH/PUT /in_juties/1
|
# PATCH/PUT /in_juties/1
|
||||||
# PATCH/PUT /in_juties/1.json
|
# PATCH/PUT /in_juties/1.json
|
||||||
def update
|
def update
|
||||||
|
in_juty = in_juty_params
|
||||||
|
in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i
|
||||||
|
in_time = in_time.change(offset: '+06:30')
|
||||||
|
out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i
|
||||||
|
out_time = out_time.change(offset: '+06:30')
|
||||||
|
@in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
|
||||||
|
@in_juty.in_time = in_time
|
||||||
|
@in_juty.out_time = out_time
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @in_juty.update(in_juty_params)
|
if @in_juty.save
|
||||||
format.html { redirect_to origami_in_juty_path(@in_juty), notice: 'In juty was successfully updated.' }
|
format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' }
|
||||||
format.json { render :show, status: :ok, location: @in_juty }
|
format.json { render :show, status: :ok, location: @in_juty }
|
||||||
else
|
else
|
||||||
format.html { render :edit }
|
format.html { render :edit }
|
||||||
@@ -91,28 +118,32 @@ class Origami::InJutiesController < BaseOrigamiController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def update_for_in_juty
|
||||||
def update_for_in_juty
|
in_juty = in_juty_params
|
||||||
@in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
|
in_time = DateTime.new in_juty['in_time(1i)'].to_i, in_juty['in_time(2i)'].to_i, in_juty['in_time(3i)'].to_i, in_juty['in_time(4i)'].to_i, in_juty['in_time(5i)'].to_i
|
||||||
@in_juty.in_time = in_juty_params[:in_time]
|
in_time = in_time.change(offset: '+06:30')
|
||||||
@in_juty.out_time = in_juty_params[:out_time]
|
out_time = DateTime.new in_juty['out_time(1i)'].to_i, in_juty['out_time(2i)'].to_i, in_juty['out_time(3i)'].to_i, in_juty['out_time(4i)'].to_i, in_juty['out_time(5i)'].to_i
|
||||||
respond_to do |format|
|
out_time = out_time.change(offset: '+06:30')
|
||||||
if @in_juty.save
|
@in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
|
||||||
format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' }
|
@in_juty.in_time = in_time
|
||||||
format.json { render :show, status: :ok, location: @in_juty }
|
@in_juty.out_time = out_time
|
||||||
else
|
respond_to do |format|
|
||||||
format.html { render :edit }
|
if @in_juty.save
|
||||||
format.json { render json: @in_juty.errors, status: :unprocessable_entity }
|
format.html { redirect_to origami_index_in_juty_path(in_juty_params[:dinning_id]), notice: 'In juty was successfully updated.' }
|
||||||
end
|
format.json { render :show, status: :ok, location: @in_juty }
|
||||||
end
|
else
|
||||||
|
format.html { render :edit }
|
||||||
|
format.json { render json: @in_juty.errors, status: :unprocessable_entity }
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# DELETE /in_juties/1
|
# DELETE /in_juties/1
|
||||||
# DELETE /in_juties/1.json
|
# DELETE /in_juties/1.json
|
||||||
def destroy
|
def destroy
|
||||||
@in_juty.destroy
|
@in_juty.destroy
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully destroyed.' }
|
format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully removed.' }
|
||||||
format.json { head :no_content }
|
format.json { head :no_content }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -122,19 +153,20 @@ class Origami::InJutiesController < BaseOrigamiController
|
|||||||
@in_juty.destroy
|
@in_juty.destroy
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { redirect_to origami_index_in_juty_path(@table_id), notice: 'In juty was successfully destroyed.' }
|
format.html { redirect_to origami_index_in_juty_path(@table_id), notice: 'In juty was successfully removed.' }
|
||||||
format.json { head :no_content }
|
format.json { head :no_content }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
# Use callbacks to share common setup or constraints between actions.
|
|
||||||
def set_in_juty
|
|
||||||
@in_juty = InJuty.find(params[:id])
|
|
||||||
end
|
|
||||||
|
|
||||||
# Never trust parameters from the scary internet, only allow the white list through.
|
# Use callbacks to share common setup or constraints between actions.
|
||||||
def in_juty_params
|
def set_in_juty
|
||||||
params.require(:in_juty).permit(:id,:dinning_id,:commissioner_ids,:in_time,:out_time)
|
@in_juty = InJuty.find(params[:id])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Never trust parameters from the scary internet, only allow the white list through.
|
||||||
|
def in_juty_params
|
||||||
|
params.require(:in_juty).permit(:id, :dinning_id, :commissioner_ids, :in_time, :out_time)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -76,6 +76,17 @@ class Settings::PromotionsController < ApplicationController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def find_item_instance
|
||||||
|
item = MenuItem.find_by_item_code(params[:item_code])
|
||||||
|
if item.nil?
|
||||||
|
product = Product.where("item_code = ?",params[:item_code]).pluck(:name,:item_code)
|
||||||
|
render json: product
|
||||||
|
else
|
||||||
|
menu_instance = MenuItemInstance.where("menu_item_id = ?",item.id).pluck(:item_instance_name,:item_instance_code)
|
||||||
|
render json: menu_instance
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
# Use callbacks to share common setup or constraints between actions.
|
# Use callbacks to share common setup or constraints between actions.
|
||||||
def set_promotion
|
def set_promotion
|
||||||
|
|||||||
9
app/jobs/inventory_job.rb
Normal file
9
app/jobs/inventory_job.rb
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
class InventoryJob < ApplicationJob
|
||||||
|
queue_as :default
|
||||||
|
|
||||||
|
def perform(sale_id)
|
||||||
|
saleObj = Sale.find(sale_id)
|
||||||
|
InventoryDefinition.calculate_product_count(saleObj)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
@@ -1,2 +1,41 @@
|
|||||||
class InventoryDefinition < ApplicationRecord
|
class InventoryDefinition < ApplicationRecord
|
||||||
|
|
||||||
|
scope :active, -> {where(:is_active => true)}
|
||||||
|
|
||||||
|
def self.calculate_product_count(saleObj)
|
||||||
|
saleObj.sale_items.each do |item|
|
||||||
|
found, inventory_definition = find_product_in_inventory(item)
|
||||||
|
if found
|
||||||
|
check_balance(item,inventory_definition)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.find_product_in_inventory(item)
|
||||||
|
product = InventoryDefinition.find_by_item_code(item.product_code)
|
||||||
|
if product.nil?
|
||||||
|
return false, nil
|
||||||
|
else
|
||||||
|
return true, product
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.check_balance(item,inventory_definition) # item => saleItemOBj
|
||||||
|
stock = StockJournal.where('item_code=?', item.product_code).order('created_at desc').take
|
||||||
|
unless stock.nil?
|
||||||
|
modify_balance(item, stock, inventory_definition)
|
||||||
|
else
|
||||||
|
StockJournal.add_to_journal(item, 0, "out of stock", inventory_definition)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.modify_balance(item, stock, inventory_definition) #saleitemObj
|
||||||
|
if stock.balance.to_i >= item.qty
|
||||||
|
puts ">> stock is greater than orde qty"
|
||||||
|
StockJournal.add_to_journal(item, stock.balance, "ok", inventory_definition)
|
||||||
|
else
|
||||||
|
puts " << stock is less than order qty"
|
||||||
|
StockJournal.add_to_journal(item, stock.balance, "out of stock", inventory_definition)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ class MenuItem < ApplicationRecord
|
|||||||
|
|
||||||
scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') }
|
scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') }
|
||||||
scope :set_menu_item, -> { where(type: 'SetMenuItem') }
|
scope :set_menu_item, -> { where(type: 'SetMenuItem') }
|
||||||
|
scope :active, -> { where(is_available: true) }
|
||||||
|
|
||||||
# Item Image Uploader
|
# Item Image Uploader
|
||||||
mount_uploader :image_path, MenuItemImageUploader
|
mount_uploader :image_path, MenuItemImageUploader
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class Promotion < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def self.is_between_promo_datetime(current_day,current_time) #database is not local time
|
def self.is_between_promo_datetime(current_day,current_time) #database is not local time
|
||||||
promoList = Promotion.where("(date_format(promo_start_date, 'YYYY-MM-DD') <=? AND date_format(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time)
|
promoList = Promotion.where("(TO_CHAR(promo_start_date, 'YYYY-MM-DD') <=? AND TO_CHAR(promo_end_date, 'YYYY-MM-DD') >=?) AND (promo_start_hour < ? AND promo_end_hour > ?)", current_day, current_day, current_time, current_time)
|
||||||
return promoList
|
return promoList
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -45,8 +45,8 @@ class Promotion < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def self.find_promo_item(promo, orderitem, sale_id)
|
def self.find_promo_item(promo, orderitem, sale_id)
|
||||||
item_code = OrderItem.find_by_item_instance_code(orderitem[0]).item_code
|
# item_code = OrderItem.find_by_item_instance_code(orderitem[0]).item_code
|
||||||
if promo.original_product.to_s == item_code
|
if promo.original_product.to_s == orderitem[0]
|
||||||
if promo.min_qty.to_i > orderitem[1].to_i
|
if promo.min_qty.to_i > orderitem[1].to_i
|
||||||
return false
|
return false
|
||||||
else
|
else
|
||||||
@@ -77,7 +77,7 @@ class Promotion < ApplicationRecord
|
|||||||
|
|
||||||
def self.check_giveaway_product(promo, orderitem)
|
def self.check_giveaway_product(promo, orderitem)
|
||||||
promo.promotion_products.each do |promo_product|
|
promo.promotion_products.each do |promo_product|
|
||||||
if promo_product.item_code == OrderItem.find_by_item_instance_code(orderitem).item_code
|
if promo_product.item_code == orderitem
|
||||||
return true, promo_product
|
return true, promo_product
|
||||||
else
|
else
|
||||||
return false, promo_product
|
return false, promo_product
|
||||||
@@ -113,12 +113,11 @@ class Promotion < ApplicationRecord
|
|||||||
charge_qty += qty
|
charge_qty += qty
|
||||||
end
|
end
|
||||||
item = OrderItem.find_by_item_instance_code(orderitem[0])
|
item = OrderItem.find_by_item_instance_code(orderitem[0])
|
||||||
byebug
|
if promo_product == OrderItem.find_by_item_instance_code(orderitem[0]).item_code
|
||||||
# if promo_product == OrderItem.find_by_item_instance_code(orderitem[0]).item_code
|
item = OrderItem.find_by_item_instance_code(orderitem[0])
|
||||||
# item = OrderItem.find_by_item_instance_code(orderitem[0])
|
else
|
||||||
# else
|
item = OrderItem.find_by_item_code(promo_product)
|
||||||
# item = OrderItem.find_by_item_code(promo_product)
|
end
|
||||||
# end
|
|
||||||
update_existing_item(foc_qty, item, sale_id, "promotion", item.price)
|
update_existing_item(foc_qty, item, sale_id, "promotion", item.price)
|
||||||
|
|
||||||
puts "Charged - " + charge_qty.to_s
|
puts "Charged - " + charge_qty.to_s
|
||||||
@@ -127,12 +126,13 @@ class Promotion < ApplicationRecord
|
|||||||
# AA - 10 # 3 # BB # orderList, #S34345
|
# AA - 10 # 3 # BB # orderList, #S34345
|
||||||
def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, sale_id)
|
def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, sale_id)
|
||||||
puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s
|
puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s
|
||||||
|
byebug
|
||||||
promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty
|
promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty
|
||||||
foc_qty = find_second_item_qty(sale_id, promo_product)
|
foc_qty = find_second_item_qty(sale_id, promo_product)
|
||||||
if (foc_qty < promotion_qty)
|
if (foc_qty < promotion_qty)
|
||||||
promotion_qty = foc_qty
|
promotion_qty = foc_qty
|
||||||
end
|
end
|
||||||
item = OrderItem.find_by_item_instance_code(promo_product,orderID)
|
item = OrderItem.find_by_item_instance_code(promo_product)
|
||||||
update_existing_item(promotion_qty, item, sale_id, "promotion", item.price)
|
update_existing_item(promotion_qty, item, sale_id, "promotion", item.price)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -152,7 +152,6 @@ class Promotion < ApplicationRecord
|
|||||||
|
|
||||||
sale_item.is_taxable = false
|
sale_item.is_taxable = false
|
||||||
sale_item.sale_id = sale_id
|
sale_item.sale_id = sale_id
|
||||||
|
|
||||||
sale_item.save
|
sale_item.save
|
||||||
sale = Sale.find(sale_id)
|
sale = Sale.find(sale_id)
|
||||||
sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount)
|
sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount)
|
||||||
@@ -163,7 +162,7 @@ class Promotion < ApplicationRecord
|
|||||||
puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s
|
puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s
|
||||||
|
|
||||||
if same
|
if same
|
||||||
foc_qty = orderitem[1].to_i / foc_min_qty
|
foc_qty = orderitem[1].to_i / foc_min_qty
|
||||||
item = OrderItem.find_by_item_instance_code(orderitem[0])
|
item = OrderItem.find_by_item_instance_code(orderitem[0])
|
||||||
update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off)
|
update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off)
|
||||||
else
|
else
|
||||||
@@ -213,7 +212,7 @@ class Promotion < ApplicationRecord
|
|||||||
saleObj = Sale.find_by_sale_id(sale_id)
|
saleObj = Sale.find_by_sale_id(sale_id)
|
||||||
itemList = combine_item(saleObj)
|
itemList = combine_item(saleObj)
|
||||||
itemList.each do |item|
|
itemList.each do |item|
|
||||||
if OrderItem.find_by_item_instance_code(item[0]).item_code == promo_item
|
if item[0] == promo_item
|
||||||
return item[1]
|
return item[1]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -118,6 +118,8 @@ class Sale < ApplicationRecord
|
|||||||
create_saleitem_diningcharges(charges, diningprice, booking.dining_facility.name, dining_time)
|
create_saleitem_diningcharges(charges, diningprice, booking.dining_facility.name, dining_time)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
InventoryJob.perform_now(self.id)
|
||||||
|
|
||||||
return true, self.id
|
return true, self.id
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,17 @@
|
|||||||
class StockCheck < ApplicationRecord
|
class StockCheck < ApplicationRecord
|
||||||
|
|
||||||
|
has_many :stock_check_items
|
||||||
|
|
||||||
|
def create(user, eason, item_list)
|
||||||
|
self.reason = reason
|
||||||
|
self.check_by = user.id
|
||||||
|
self.check_start = Time.now
|
||||||
|
self.check_end = Time.now
|
||||||
|
self.save
|
||||||
|
item_list.each do |item|
|
||||||
|
stockItem = StockCheckItem.new
|
||||||
|
stockItem.create(self.id,item)
|
||||||
|
end
|
||||||
|
return self
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,2 +1,36 @@
|
|||||||
class StockCheckItem < ApplicationRecord
|
class StockCheckItem < ApplicationRecord
|
||||||
|
|
||||||
|
belongs_to :stock_check
|
||||||
|
|
||||||
|
def create(stock_id, item)
|
||||||
|
journal_id, balance = StockCheckItem.find_journal(item['sku'])
|
||||||
|
remark, different = StockCheckItem.stock_different(item['qty'], balance )
|
||||||
|
self.stock_check_id = stock_id
|
||||||
|
self.item_code = item['sku']
|
||||||
|
self.stock_count = item['qty']
|
||||||
|
self.stock_journal_id = journal_id
|
||||||
|
self.stock_balance = balance
|
||||||
|
self.different = different
|
||||||
|
self.remark = remark
|
||||||
|
self.save
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.find_journal(item_code)
|
||||||
|
journal = StockJournal.where('item_code=?', item_code).order('created_at desc').take
|
||||||
|
if journal
|
||||||
|
return journal.id, journal.balance
|
||||||
|
else
|
||||||
|
return nil, 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.stock_different(stock_check_qty, journal_balance)
|
||||||
|
if stock_check_qty.to_i == journal_balance.to_i
|
||||||
|
return 'match', stock_check_qty
|
||||||
|
elsif stock_check_qty.to_i > journal_balance.to_i
|
||||||
|
return 'missing order item', stock_check_qty.to_i - journal_balance.to_i
|
||||||
|
elsif stock_check_qty.to_i < journal_balance.to_i
|
||||||
|
return 'missing stock', stock_check_qty.to_i - journal_balance.to_i
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,2 +1,39 @@
|
|||||||
class StockJournal < ApplicationRecord
|
class StockJournal < ApplicationRecord
|
||||||
|
|
||||||
|
SALES_TRANS = "sale"
|
||||||
|
STOCK_CHECK_TRANS = "stock_check"
|
||||||
|
|
||||||
|
def self.add_to_journal(item, balance, stock_message, inventory_definition) # item => saleObj | balance => Stock journal
|
||||||
|
|
||||||
|
balance = calculate_balance(balance, item.qty)
|
||||||
|
|
||||||
|
journal = StockJournal.new
|
||||||
|
journal.item_code = item.product_code
|
||||||
|
journal.inventory_definition_id = inventory_definition.id
|
||||||
|
journal.debit = item.qty
|
||||||
|
journal.balance = balance
|
||||||
|
journal.remark = stock_message
|
||||||
|
journal.trans_ref = item.id
|
||||||
|
journal.trans_type = StockJournal::SALES_TRANS
|
||||||
|
journal.save
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.calculate_balance(balance, qty)
|
||||||
|
return balance.to_i - qty.to_i
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.from_stock_check(item)
|
||||||
|
definition_id = InventoryDefinition.find_by_item_code(item.item_code)
|
||||||
|
journal = StockJournal.new
|
||||||
|
journal.item_code = item.item_code
|
||||||
|
journal.inventory_definition_id = definition_id.id
|
||||||
|
journal.debit = 0
|
||||||
|
journal.credit = item.stock_count
|
||||||
|
journal.balance = item.stock_count
|
||||||
|
journal.remark = StockJournal::STOCK_CHECK_TRANS
|
||||||
|
journal.trans_ref = item.id
|
||||||
|
journal.trans_type = StockJournal::STOCK_CHECK_TRANS
|
||||||
|
journal.save
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -195,7 +195,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div> -->
|
</div> -->
|
||||||
|
|
||||||
<div class="card" id="backend" onclick="location.href='<%= inventory_inventory_path %>'">
|
<div class="card" id="backend" onclick="location.href='<%= inventory_path %>'">
|
||||||
<div class="card-content dashboard-nav">Inventory</div>
|
<div class="card-content dashboard-nav">Inventory</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
40
app/views/inventory/inventory/_inventory_list.html.erb
Normal file
40
app/views/inventory/inventory/_inventory_list.html.erb
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-8"><h2> Inventoy Product Lists</h2></div>
|
||||||
|
<div class="col-md-4"><button id='new_inventory_product' class='btn btn-primary' style='margin-top:15px;'>New Inventory Product</button></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<table class="table table-striped">
|
||||||
|
<tr>
|
||||||
|
<th>#</th>
|
||||||
|
<th>Product</th>
|
||||||
|
<th>Min Order</th>
|
||||||
|
<th>Max Stock</th>
|
||||||
|
<th>Created by</th>
|
||||||
|
<th>Created Time</th>
|
||||||
|
</tr>
|
||||||
|
<%
|
||||||
|
count = 0
|
||||||
|
@products.each do |item|
|
||||||
|
count += 1
|
||||||
|
%>
|
||||||
|
<tr>
|
||||||
|
<td><%= count %></td>
|
||||||
|
<td><%= item.item_code rescue ""%></td>
|
||||||
|
<td><%= item.min_order_level %></td>
|
||||||
|
<td><%= item.max_stock_level %></td>
|
||||||
|
<td><%= item.created_by%></td>
|
||||||
|
<td><%= item.created_at%></td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$('#new_inventory_product').on('click',function(){
|
||||||
|
window.location.href = '/inventory/inventory_definitions/new';
|
||||||
|
})
|
||||||
|
</script>
|
||||||
@@ -1,17 +1,22 @@
|
|||||||
# Hello Inventory
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-lg-8 col-md-8 col-sm-8">
|
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-10 col-md-10 col-sm-10">
|
||||||
|
<%= render 'inventory_list' %>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-4 col-md-4 col-sm-4">
|
<div class="col-lg-2 col-md-2 col-sm-2">
|
||||||
<button id="refreshbutton" type="button" class="btn btn-block"> Inventory Product Lists</button>
|
|
||||||
<button id="cash_in" type="button" class="btn btn-block btn-primary"> Stock Taking </button>
|
|
||||||
<button id="cash_out" type="button" class="btn btn-block btn-primary"> Stock Check Report</button>
|
|
||||||
|
|
||||||
<%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
|
<%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
|
||||||
<button id="back" type="button" class="btn btn-block btn-primary"><i class="fa fa-home fa-lg"></i> Back
|
<button id="back" type="button" class="btn btn-block btn-primary"> Back </button>
|
||||||
</button>
|
|
||||||
<%end%>
|
<%end%>
|
||||||
|
<button id="stock_taking" type="button" class="btn btn-block btn-primary"> New Stock Taking </button>
|
||||||
|
<button id="stock_check_report" type="button" class="btn btn-block btn-primary"> Stock Check Report</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$('#stock_taking').on('click',function(){
|
||||||
|
window.location.href = '/inventory/stock_checks';
|
||||||
|
})
|
||||||
|
$('#stock_check_report').on('click', function(){
|
||||||
|
window.location.href = '';
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|||||||
@@ -1,10 +1,15 @@
|
|||||||
<%= simple_form_for(@inventory_definition) do |f| %>
|
|
||||||
|
<%= simple_form_for([:inventory,@inventory_definition]) do |f| %>
|
||||||
<%= f.error_notification %>
|
<%= f.error_notification %>
|
||||||
|
|
||||||
<div class="form-inputs">
|
<div class="form-inputs">
|
||||||
|
<%= f.input :item_code %>
|
||||||
|
<%= f.input :min_order_level %>
|
||||||
|
<%= f.input :max_stock_level %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-actions">
|
<div class="form-actions">
|
||||||
<%= f.button :submit %>
|
<%= f.button :submit %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
<h1>New Inventory Definition</h1>
|
|
||||||
|
|
||||||
<%= render 'form', inventory_definition: @inventory_definition %>
|
<div class="span12">
|
||||||
|
<div class="page-header">
|
||||||
<%= link_to 'Back', inventory_definitions_path %>
|
<ul class="breadcrumb">
|
||||||
|
<li><a href="<%= root_path %>">Home</a></li>
|
||||||
|
<li><a href="<%= inventory_path %>">Product Inventory</a></li>
|
||||||
|
<li>New</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<%= render 'form', inventory: @inventory_definition %>
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
<%= simple_form_for(@stock_check) do |f| %>
|
|
||||||
<%= f.error_notification %>
|
|
||||||
|
|
||||||
<div class="form-inputs">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-actions">
|
|
||||||
<%= f.button :submit %>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
json.extract! stock_check, :id, :created_at, :updated_at
|
|
||||||
json.url stock_check_url(stock_check, format: :json)
|
|
||||||
1
app/views/inventory/stock_checks/create.json.jbuilder
Normal file
1
app/views/inventory/stock_checks/create.json.jbuilder
Normal file
@@ -0,0 +1 @@
|
|||||||
|
json.stock_id @check.id
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<h1>Editing Stock Check</h1>
|
|
||||||
|
|
||||||
<%= render 'form', stock_check: @stock_check %>
|
|
||||||
|
|
||||||
<%= link_to 'Show', @stock_check %> |
|
|
||||||
<%= link_to 'Back', stock_checks_path %>
|
|
||||||
@@ -1,25 +1,102 @@
|
|||||||
<p id="notice"><%= notice %></p>
|
<div class="row">
|
||||||
|
<div class="col-md-6">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
|
||||||
<h1>Stock Checks</h1>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''></input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<br>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-2"></div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
Product
|
||||||
|
</div>
|
||||||
|
<div class="col-md-7">
|
||||||
|
<input type='text' class='form-control' placeholder="Product Name" id='product_sku' value=''></input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<br>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-2"></div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
Qty
|
||||||
|
</div>
|
||||||
|
<div class="col-md-7">
|
||||||
|
<input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''></input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<br>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-4"></div>
|
||||||
|
<div class="col-md-7">
|
||||||
|
<button class="btn btn-primary form-control" id='save_to_stock_check'> Save </button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<table>
|
<div class="col-md-5">
|
||||||
<thead>
|
<div class="row">
|
||||||
<tr>
|
<div class="col-md-12">
|
||||||
<th colspan="3"></th>
|
<table class="table table-striped" id='stock_item'>
|
||||||
</tr>
|
<tr>
|
||||||
</thead>
|
<th>#</th>
|
||||||
|
<th>Product</th>
|
||||||
|
<th>Balance</th>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-1">
|
||||||
|
<div class="row">
|
||||||
|
<button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish </button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<tbody>
|
<script>
|
||||||
<% @stock_checks.each do |stock_check| %>
|
var count = 0
|
||||||
<tr>
|
|
||||||
<td><%= link_to 'Show', stock_check %></td>
|
|
||||||
<td><%= link_to 'Edit', edit_stock_check_path(stock_check) %></td>
|
|
||||||
<td><%= link_to 'Destroy', stock_check, method: :delete, data: { confirm: 'Are you sure?' } %></td>
|
|
||||||
</tr>
|
|
||||||
<% end %>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<br>
|
$('#save_to_stock_check').on('click', function(){
|
||||||
|
count += 1;
|
||||||
|
product_sku = $('#product_sku').val();
|
||||||
|
product_qty = $('#product_qty').val();
|
||||||
|
var tr = '<tr>'
|
||||||
|
+ '<td>'+ count +'</td>'
|
||||||
|
+ '<td><input type=text value="'+ product_sku +'" id="item_sku_'+ count +'" name='+count+'></input></td>'
|
||||||
|
+ '<td><input type=text value="'+ product_qty +'" id="item_qty_'+ count +'" name='+count+'></input></td>'
|
||||||
|
+ '</tr>'
|
||||||
|
$('#stock_item').append(tr)
|
||||||
|
$('#product_sku').val('');
|
||||||
|
$('#product_qty').val('');
|
||||||
|
})
|
||||||
|
|
||||||
<%= link_to 'New Stock Check', new_stock_check_path %>
|
$('#finish').on('click',function(){
|
||||||
|
var reason = $('#stock_check_reason').val();
|
||||||
|
var arr = [];
|
||||||
|
var jsonStr = ''
|
||||||
|
|
||||||
|
for(var i = 1; i <= count; i++){
|
||||||
|
itemname = $('#item_sku_'+i ).val();
|
||||||
|
itemqty = $('#item_qty_'+i ).val();
|
||||||
|
arr.push({sku:itemname, qty:itemqty})
|
||||||
|
jsonStr = JSON.stringify(arr)
|
||||||
|
}
|
||||||
|
console.log(jsonStr)
|
||||||
|
$.ajax({
|
||||||
|
type: 'Post',
|
||||||
|
url: '<%= inventory_stock_check_save_path %>',
|
||||||
|
data:'stock_item='+ jsonStr + '&reason='+ reason,
|
||||||
|
success:function(data){
|
||||||
|
alert(data['stock_id'])
|
||||||
|
window.location.href = '/inventory/stock_checks/'+ data['stock_id'];
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
json.array! @stock_checks, partial: 'stock_checks/stock_check', as: :stock_check
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<h1>New Stock Check</h1>
|
|
||||||
|
|
||||||
<%= render 'form', stock_check: @stock_check %>
|
|
||||||
|
|
||||||
<%= link_to 'Back', stock_checks_path %>
|
|
||||||
@@ -1,4 +1,74 @@
|
|||||||
<p id="notice"><%= notice %></p>
|
<div class="row">
|
||||||
|
<input type='hidden' id='stock_check_id' value='<%= @check.id %>'/>
|
||||||
|
<div class="col-md-10">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-2">
|
||||||
|
Check by
|
||||||
|
</div>
|
||||||
|
<div class="col-md-8">
|
||||||
|
<%= @check.check_by %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-2">
|
||||||
|
Check At
|
||||||
|
</div>
|
||||||
|
<div class="col-md-8">
|
||||||
|
<%= @check.created_at %></div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-2">
|
||||||
|
Reason
|
||||||
|
</div>
|
||||||
|
<div class="col-md-8">
|
||||||
|
<%= @check.reason %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<br>
|
||||||
|
<div class="row">
|
||||||
|
<table class="table table-striped col-md-12">
|
||||||
|
<tr>
|
||||||
|
<th>#</th>
|
||||||
|
<th>Product</th>
|
||||||
|
<th>Stock Count</th>
|
||||||
|
<th>Stock Balance</th>
|
||||||
|
<th>Different</th>
|
||||||
|
<th>Remark</th>
|
||||||
|
</tr>
|
||||||
|
<%
|
||||||
|
count = 0
|
||||||
|
@check.stock_check_items.each do |item|
|
||||||
|
count += 1
|
||||||
|
%>
|
||||||
|
<tr>
|
||||||
|
<td><%= count %></td>
|
||||||
|
<td><%= item.item_code %></td>
|
||||||
|
<td><%= item.stock_count %></td>
|
||||||
|
<td><%= item.stock_balance %></td>
|
||||||
|
<td><%= item.different %></td>
|
||||||
|
<td><%= item.remark %></td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<button id="back" type="button" class="btn btn-block btn-primary"> Back </button>
|
||||||
|
<button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal </button>
|
||||||
|
<button id="print" type="button" class="btn btn-block btn-primary"> Print </button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<%= link_to 'Edit', edit_stock_check_path(@stock_check) %> |
|
<script>
|
||||||
<%= link_to 'Back', stock_checks_path %>
|
$('#save_to_journal').on('click', function(){
|
||||||
|
check_id = $('#stock_check_id').val();
|
||||||
|
$.ajax({
|
||||||
|
type: 'post',
|
||||||
|
url: '<%= inventory_save_to_journal_path %>',
|
||||||
|
data: 'data='+ check_id,
|
||||||
|
success: function(){
|
||||||
|
alert('success')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
json.partial! "stock_checks/stock_check", stock_check: @stock_check
|
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
<title>SmartSales : Restaurant</title>
|
<title>SmartSales : Restaurant</title>
|
||||||
<%= csrf_meta_tags %>
|
<%= csrf_meta_tags %>
|
||||||
|
|
||||||
<%= stylesheet_link_tag 'inventory', media: 'all', 'data-turbolinks-track': 'reload' %>
|
<%= stylesheet_link_tag 'origami', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||||
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
|
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
|
||||||
<%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
|
<%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||||
<%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>
|
<%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
<%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %>
|
<%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %>
|
||||||
|
|
||||||
<%= f.input :out_time, :placeholder => "From Date", :class => "form-control" %>
|
<%= f.input :out_time, :placeholder => "To Date", :class => "form-control" %>
|
||||||
|
|
||||||
</div><br>
|
</div><br>
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
<%= simple_form_for([:origami,@in_juty]) do |f| %>
|
<%= simple_form_for([:origami, @in_juty]) do |f| %>
|
||||||
<%= f.error_notification %>
|
<%= f.error_notification %>
|
||||||
|
|
||||||
<div class="form-inputs">
|
<div class="form-inputs">
|
||||||
<%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %><br/><br/>
|
<%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
|
||||||
<%= f.input :in_time %>
|
<br/><br/>
|
||||||
<%= f.input :out_time %>
|
<%= f.input :in_time %>
|
||||||
</div>
|
<%= f.input :out_time %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-actions">
|
<div class="form-actions">
|
||||||
<%= f.button :submit %>
|
<%= f.button :submit %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,33 +1,43 @@
|
|||||||
<div class="col-md-3">
|
<%= simple_form_for @in_juty, :url => origami_index_in_juty_path(@table.id), :method => :post do |f| %>
|
||||||
<%= simple_form_for([:origami,@in_juty]) do |f| %>
|
<span class="patch_method"></span>
|
||||||
<%= f.error_notification %>
|
<%= f.error_notification %>
|
||||||
|
<%= f.hidden_field :id, :class => "form-control col-md-6 " %>
|
||||||
|
|
||||||
|
<div class="form-inputs">
|
||||||
|
|
||||||
|
<%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %>
|
||||||
|
|
||||||
|
<label>Dining Name:</label>
|
||||||
|
<%= @table.name %>
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
|
||||||
|
<label>Commissioner Name:</label>
|
||||||
|
<%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
|
||||||
|
<br/><br/>
|
||||||
|
|
||||||
|
<%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %>
|
||||||
|
|
||||||
|
<%= f.input :out_time, :placeholder => "To Date", :class => "form-control" %>
|
||||||
|
|
||||||
|
</div><br>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<% f.button :submit, "Create", :class => 'btn btn-primary ', :id => 'create' %>
|
||||||
|
<% f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %>
|
||||||
|
<% f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %>
|
||||||
|
</div>
|
||||||
|
<div class="form-actions">
|
||||||
|
<%= f.button :submit, :class => 'btn btn-primary' %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-inputs">
|
|
||||||
<%= f.label :dinning_id %>
|
|
||||||
<%= f.collection_select :dinning_id, DiningFacility.all, :id, :name, {prompt: 'Select Dining Facilities'}, {class: 'form-control'} %><br/>
|
|
||||||
<%= f.label :commissioner_ids %>
|
|
||||||
<%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %><br/>
|
|
||||||
<label>In time</label>
|
|
||||||
<%= f.text_field :in_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%><br/>
|
|
||||||
<label>Out time</label>
|
|
||||||
<%= f.text_field :out_time, :value=>DateTime.now.strftime("%Y-%m-%d / %I:%M %p"),:class=>"form-control datepicker"%>
|
|
||||||
</div><br>
|
|
||||||
<div class="form-actions">
|
|
||||||
<%= link_to 'Back', origami_in_juties_path, class: 'btn btn-success' %>
|
|
||||||
<%= f.button :submit, class: 'btn btn-info' %>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
$(function() {
|
$(document).ready(function () {
|
||||||
$('.datepicker').datepicker({
|
|
||||||
format : 'dd-mm-yyyy',
|
|
||||||
autoclose: true
|
|
||||||
});
|
|
||||||
$('.datepicker').attr('ReadOnly','true');
|
|
||||||
$('.datepicker').css('cursor','pointer');
|
|
||||||
});
|
|
||||||
|
|
||||||
</script>
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|||||||
@@ -1,38 +1,91 @@
|
|||||||
<div class="page-header">
|
<div class="row">
|
||||||
<ul class="breadcrumb">
|
|
||||||
<li><a href="<%= origami_root_path %>">Home</a></li>
|
<div class="col-md-8">
|
||||||
<li>In Juties</li>
|
<table class="table table-striped">
|
||||||
<span style="float: right">
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Select</th>
|
||||||
|
<th>Dining Facility Name</th>
|
||||||
|
<th>Commissioner Ids</th>
|
||||||
|
<th>In time</th>
|
||||||
|
<th>Out time</th>
|
||||||
|
<th colspan="2"></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
<% @juties_in.each do |in_juty| %>
|
||||||
|
<tr class="injuty_tr" data-ref="<%= in_juty.id %>">
|
||||||
|
<td>
|
||||||
|
<input type="radio" style="width:20px;" name="checkbox" class="checkbox_check"></td>
|
||||||
|
<td><%= in_juty.dining_facility.name rescue '-' %></td>
|
||||||
|
<td><%= in_juty.commissioner.name rescue '-' %></td>
|
||||||
|
<td><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
|
||||||
|
<td><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
|
||||||
|
<td><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<%= paginate @juties_in %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-4 partial">
|
||||||
|
<%= render 'form', in_juty: @in_juty, table: @table %>
|
||||||
|
</div>
|
||||||
|
<span style="float: right">
|
||||||
<%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_juty_path, :class => 'btn btn-primary btn-sm' %>
|
<%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_juty_path, :class => 'btn btn-primary btn-sm' %>
|
||||||
</span>
|
</span>
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<div class="col-md-1">
|
||||||
<div class="card">
|
<button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
|
||||||
<table class="table table-striped">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Dining Facility Name</th>
|
|
||||||
<th>Commissioner Ids</th>
|
|
||||||
<th>In time</th>
|
|
||||||
<th>Out time</th>
|
|
||||||
<th colspan="3"></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
|
|
||||||
<tbody>
|
|
||||||
<% @in_juties.each do |in_juty| %>
|
|
||||||
<tr>
|
|
||||||
<td><%= in_juty.dining_facility.name rescue '-' %></td>
|
|
||||||
<td><%= in_juty.commissioner.name rescue '-' %></td>
|
|
||||||
<td><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
|
|
||||||
<td><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
|
|
||||||
<td><%= link_to 'Show', origami_in_juty_path(in_juty) %></td>
|
|
||||||
<td><%= link_to 'Edit', edit_origami_in_juty_path(in_juty) %></td>
|
|
||||||
<td><%= link_to 'Destroy', origami_in_juty_path(in_juty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
|
|
||||||
</tr>
|
|
||||||
<% end %>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(document).on('click', ".injuty_tr", function () {
|
||||||
|
|
||||||
|
$(this).closest('tr').find('.checkbox_check').prop("checked", true);
|
||||||
|
|
||||||
|
var in_juty_id = $(this).attr('data-ref');
|
||||||
|
var table_id = "<%= @table.id %>";
|
||||||
|
var url = "/origami/assign_in_juty/table/" + table_id + "/in_juty/" + in_juty_id + "/edit";
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
type: "GET",
|
||||||
|
url: url,
|
||||||
|
data: {},
|
||||||
|
|
||||||
|
success: function (data) {
|
||||||
|
debugger;
|
||||||
|
$('.partial').empty().append(data);
|
||||||
|
// $('#in_juty_id').val(data.in_juty.id);
|
||||||
|
// $('#in_juty_commissioner_ids').val(data.commissioner.id);
|
||||||
|
// $('#in_juty_in_time').val(data.in_juty.in_time);
|
||||||
|
// $('#in_juty_out_time').val(data.in_juty.out_time);
|
||||||
|
//
|
||||||
|
// $('#update').removeAttr('disabled').val('');
|
||||||
|
// $('#update').attr('value', 'Update');
|
||||||
|
// $('#create').attr('disabled', 'disabled');
|
||||||
|
//
|
||||||
|
// $("#new_in_juty").attr('class', 'simple_form edit_in_juty');
|
||||||
|
// var id = "edit_in_juty_" + in_juty_id;
|
||||||
|
// $("#new_in_juty").attr('id', id);
|
||||||
|
//
|
||||||
|
// $(".edit_in_juty").attr('id', id);
|
||||||
|
// $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
|
||||||
|
// $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
|
||||||
|
// $(".patch_method").html('<input type="hidden" name="_method" value="patch">');
|
||||||
|
|
||||||
|
// setInterval(function () {
|
||||||
|
// $('.partial').load('/controller_name/action_name');
|
||||||
|
// }, 3000);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#back').on('click', function () {
|
||||||
|
window.location.href = '/origami/table/' + "<%= @table.id %>";
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
<td><%= in_juty.commissioner.name rescue '-' %></td>
|
<td><%= in_juty.commissioner.name rescue '-' %></td>
|
||||||
<td><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
|
<td><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
|
||||||
<td><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
|
<td><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
|
||||||
<td><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
|
<td><%= link_to 'Remove', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tbody>
|
</tbody>
|
||||||
@@ -30,11 +30,16 @@
|
|||||||
<%= paginate @juties_in %>
|
<%= paginate @juties_in %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-4">
|
<div class="col-md-4 partial">
|
||||||
<%= render 'assign_in_juty', in_juty: @in_juty, table: @table %>
|
<%= render 'form', in_juty: @in_juty, table: @table %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<button type="button" class="col-md-1 btn btn-primary btn-block" id='back'>Back</button>
|
||||||
|
<button class="col-md-1 btn btn-info" id="reset">New</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).on('click', ".injuty_tr", function () {
|
$(document).on('click', ".injuty_tr", function () {
|
||||||
|
|
||||||
@@ -50,29 +55,48 @@
|
|||||||
data: {},
|
data: {},
|
||||||
|
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
debugger;
|
||||||
|
$('.partial').empty().append(data);
|
||||||
|
// $('#in_juty_id').val(data.in_juty.id);
|
||||||
|
// $('#in_juty_commissioner_ids').val(data.commissioner.id);
|
||||||
|
// $('#in_juty_in_time').val(data.in_juty.in_time);
|
||||||
|
// $('#in_juty_out_time').val(data.in_juty.out_time);
|
||||||
|
//
|
||||||
|
// $('#update').removeAttr('disabled').val('');
|
||||||
|
// $('#update').attr('value', 'Update');
|
||||||
|
// $('#create').attr('disabled', 'disabled');
|
||||||
|
//
|
||||||
|
// $("#new_in_juty").attr('class', 'simple_form edit_in_juty');
|
||||||
|
// var id = "edit_in_juty_" + in_juty_id;
|
||||||
|
// $("#new_in_juty").attr('id', id);
|
||||||
|
//
|
||||||
|
// $(".edit_in_juty").attr('id', id);
|
||||||
|
// $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
|
||||||
|
// $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
|
||||||
|
// $(".patch_method").html('<input type="hidden" name="_method" value="patch">');
|
||||||
|
|
||||||
$('#in_juty_id').val(data.in_juty.id);
|
// setInterval(function () {
|
||||||
$('#in_juty_commissioner_ids').val(data.commissioner.id);
|
// $('.partial').load('/controller_name/action_name');
|
||||||
$('#in_juty_in_time').val(data.in_juty.in_time);
|
// }, 3000);
|
||||||
$('#in_juty_out_time').val(data.in_juty.out_time);
|
|
||||||
|
|
||||||
$('#update').removeAttr('disabled').val('');
|
|
||||||
$('#update').attr('value', 'Update');
|
|
||||||
$('#create').attr('disabled', 'disabled');
|
|
||||||
|
|
||||||
$("#new_in_juty").attr('class', 'simple_form edit_in_juty');
|
|
||||||
var id = "edit_in_juty_" + in_juty_id;
|
|
||||||
$("#new_in_juty").attr('id', id);
|
|
||||||
|
|
||||||
$(".edit_in_juty").attr('id', id);
|
|
||||||
$(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
|
|
||||||
$(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
|
|
||||||
$(".patch_method").html('<input type="hidden" name="_method" value="patch">');
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#back').on('click', function () {
|
$('#back').on('click', function () {
|
||||||
window.location.href = '/origami/table/' + "<%= @table.id %>";
|
window.location.href = '/origami/table/' + "<%= @table.id %>";
|
||||||
})
|
});
|
||||||
|
|
||||||
|
$('#reset').click(function () {
|
||||||
|
var url = "<%= new_origami_in_juty_path %>";
|
||||||
|
$.ajax({
|
||||||
|
type: "GET",
|
||||||
|
url: url,
|
||||||
|
data: { table_id: <%= @table.id %> },
|
||||||
|
success: function (data) {
|
||||||
|
$('.partial').empty().append(data);
|
||||||
|
$('.injuty_tr > td > .checkbox_check').prop("checked", false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -6,5 +6,5 @@
|
|||||||
<li>New</li>
|
<li>New</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<%= render 'form', in_juty: @in_juty %>
|
<%= render 'form', in_juty: @in_juty, table: @table %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -49,32 +49,79 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6"><%= f.input :original_product,collection: MenuItem.order("name desc").pluck(:name,:item_code),input_html: { selected: 2 } %></div>
|
<% arr = MenuItem.active.order("name desc").pluck(:name,:item_code) %>
|
||||||
|
<% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
|
||||||
|
<% arr.push(p) %>
|
||||||
|
<% end %>
|
||||||
|
<div class="col-md-3">
|
||||||
|
<label class="control-label"><abbr title="required">*</abbr> Item</label>
|
||||||
|
<select class="form-control item_code_place">
|
||||||
|
<% if !@promotion.original_product.nil? %>
|
||||||
|
<% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@promotion.original_product) %>
|
||||||
|
<% if menuiteminstance.nil?%>
|
||||||
|
<% code = @promotion.original_product %>
|
||||||
|
<% else %>
|
||||||
|
<% code = menuiteminstance.menu_item.item_code %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<% arr.each do |a| %>
|
||||||
|
<% if a[1] == code %>
|
||||||
|
<option value="<%= a[1]%>" selected><%= a[0] %></option>
|
||||||
|
<% else %>
|
||||||
|
<option value="<%= a[1]%>"><%= a[0] %></option>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<% sample = [] %>
|
||||||
|
<% if !@promotion.original_product.nil? %>
|
||||||
|
<% if !MenuItemInstance.find_by_item_instance_code(@promotion.original_product).nil? %>
|
||||||
|
<% sample = MenuItemInstance.where("item_instance_code=?",@promotion.original_product).pluck(:item_instance_name,:item_instance_code)%>
|
||||||
|
<% else %>
|
||||||
|
<% sample = Product.where("item_code=?",@promotion.original_product).pluck(:name,:item_code)%>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<div class="col-md-3"><%= f.input :original_product,collection: sample %></div>
|
||||||
|
<!-- <div class="col-md-6"><%= f.input :original_product,collection: MenuItemInstance.order("item_instance_name desc").pluck(:item_instance_name,:item_instance_code),input_html: { selected: 2 } %></div> -->
|
||||||
<div class="col-md-6"><%= f.input :min_qty %></div>
|
<div class="col-md-6"><%= f.input :min_qty %></div>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
<br>
|
||||||
<div class="" style="border: 1px solid #cccccc;padding:1%">
|
<div class="" style="border: 1px solid #cccccc;padding:1%">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-2" style="text-align:center">Item Code</div>
|
<div class="col-md-4" style="text-align:center">Item Code</div>
|
||||||
<div class="col-md-2" style="text-align:center">Min Qty</div>
|
<div class="col-md-2" style="text-align:center">Min Qty</div>
|
||||||
<div class="col-md-2" style="text-align:center">Net off</div>
|
<div class="col-md-2" style="text-align:center">Net off</div>
|
||||||
<div class="col-md-2" style="text-align:center">Net Price</div>
|
<div class="col-md-2" style="text-align:center">Net Price</div>
|
||||||
<div class="col-md-2" style="text-align:center">Percentage</div>
|
<div class="col-md-1" style="text-align:center">Percentage</div>
|
||||||
<div class="col-md-2" style="text-align:center"></div>
|
<div class="col-md-1" style="text-align:center"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row"></div >
|
<div class="row"></div >
|
||||||
<%= f.fields_for :promotion_products do |pro| %>
|
<%= f.fields_for :promotion_products do |pro| %>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-2"><%= pro.input :item_code, label: false,collection: MenuItem.order("name desc").pluck(:name,:item_code)%></div>
|
<% arr = MenuItem.active.order("name desc").pluck(:name,:item_code) %>
|
||||||
|
<% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
|
||||||
|
<% arr.push(p) %>
|
||||||
|
<% end %>
|
||||||
|
<div class="col-md-2" style="text-align:left">
|
||||||
|
<select class="form-control item_code_place1">
|
||||||
|
<% arr.each do |a| %>
|
||||||
|
<option value="<%= a[1 ]%>"><%= a[0] %></option>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<% sample = [] %>
|
||||||
|
<div class="col-md-2" style="text-align:left"><%= pro.input :item_code, :class => 'promoproduct', collection: sample,input_html: { selected: 2 }, label: false %></div>
|
||||||
<div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
|
<div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
|
||||||
<div class="col-md-2"><%= pro.input :net_off , label: false %></div>
|
<div class="col-md-2"><%= pro.input :net_off , label: false %></div>
|
||||||
<div class="col-md-2"><%= pro.input :net_price , label: false %></div>
|
<div class="col-md-2"><%= pro.input :net_price , label: false %></div>
|
||||||
<div class="col-md-2"><%= pro.input :percentage , label: false %></div>
|
<div class="col-md-1"><%= pro.input :percentage , label: false %></div>
|
||||||
<div class="col-md-2" style="text-align:right"><%= pro.link_to_remove "X" %></div>
|
<div class="col-md-1" style="text-align:right"><%= pro.link_to_remove "X" %></div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12" style="text-align:right;"><%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary' %></div>
|
<div class="col-md-12" style="text-align:right;"><%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary addProduct' %></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -103,5 +150,56 @@ $(document).ready(function(){
|
|||||||
datepicker:false,
|
datepicker:false,
|
||||||
format:'H:m'
|
format:'H:m'
|
||||||
});
|
});
|
||||||
|
$("#promotion_original_product").select2();
|
||||||
|
$(".item_code_place").select2();
|
||||||
|
$(".item_code_place").on('change', function(event) {
|
||||||
|
var ajax_url = "<%= settings_find_item_instance_path %>";
|
||||||
|
var item_code = this.value;
|
||||||
|
$.ajax({
|
||||||
|
type: "GET",
|
||||||
|
url: ajax_url,
|
||||||
|
data: 'item_code=' + item_code,
|
||||||
|
success: function (result) {
|
||||||
|
$("#promotion_original_product").empty();
|
||||||
|
var itemlist;
|
||||||
|
for (var i = 0; i < result.length; i++) {
|
||||||
|
itemlist += "<option value ="+result[i][1]+">"+result[i][0]+"</option>"
|
||||||
|
}
|
||||||
|
$("#promotion_original_product").append(itemlist);
|
||||||
|
$("#promotion_original_product").select2();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
$(".promotion_promotion_products_item_code select").select2();
|
||||||
|
$(".item_code_place1").select2();
|
||||||
|
callforpromoproduct();
|
||||||
|
$(".addProduct").on('click', function(event) {
|
||||||
|
setTimeout(function(){
|
||||||
|
$(".promotion_promotion_products_item_code select").select2();
|
||||||
|
callforpromoproduct();
|
||||||
|
}, 0);
|
||||||
|
});
|
||||||
|
function callforpromoproduct(){
|
||||||
|
$(".item_code_place1").select2();
|
||||||
|
$(".item_code_place1").on('change', function(event) {
|
||||||
|
id = $(this).parent().next().find("select").attr("id");
|
||||||
|
var ajax_url = "<%= settings_find_item_instance_path %>";
|
||||||
|
var item_code = this.value;
|
||||||
|
$.ajax({
|
||||||
|
type: "GET",
|
||||||
|
url: ajax_url,
|
||||||
|
data: 'item_code=' + item_code,
|
||||||
|
success: function (result) {
|
||||||
|
$("#"+id).empty();
|
||||||
|
var itemlist;
|
||||||
|
for (var i = 0; i < result.length; i++) {
|
||||||
|
itemlist += "<option value ="+result[i][1]+">"+result[i][0]+"</option>"
|
||||||
|
}
|
||||||
|
$("#"+id).append(itemlist);
|
||||||
|
$("#"+id).select2();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -297,6 +297,7 @@ Rails.application.routes.draw do
|
|||||||
resources :promotions do
|
resources :promotions do
|
||||||
resources :promotion_products
|
resources :promotion_products
|
||||||
end
|
end
|
||||||
|
get '/find_item_instance' => 'promotions#find_item_instance', as:'find_item_instance'
|
||||||
|
|
||||||
# commission
|
# commission
|
||||||
resources :commissions
|
resources :commissions
|
||||||
@@ -340,9 +341,12 @@ Rails.application.routes.draw do
|
|||||||
# ----------- Inventory ---------------------------
|
# ----------- Inventory ---------------------------
|
||||||
|
|
||||||
namespace :inventory do
|
namespace :inventory do
|
||||||
get 'inventory' => 'inventory#index'
|
get '/' => 'inventory#index'
|
||||||
resources :stock_check_items
|
get '/stock_checks' => 'stock_checks#index'
|
||||||
resources :stock_checks
|
post 'save_stock' => 'stock_checks#create', as:'stock_check_save'
|
||||||
|
get '/stock_checks/:id' => 'stock_checks#show'
|
||||||
|
post 'save_to_journal' => 'stock_checks#save_to_journal', as: 'save_to_journal'
|
||||||
|
# resources :stock_checks
|
||||||
resources :stock_journals
|
resources :stock_journals
|
||||||
resources :inventory_definitions
|
resources :inventory_definitions
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ class CreateInventoryDefinitions < ActiveRecord::Migration[5.1]
|
|||||||
t.string :item_code
|
t.string :item_code
|
||||||
t.integer :min_order_level, :default => 0
|
t.integer :min_order_level, :default => 0
|
||||||
t.integer :max_stock_level, :default => 0
|
t.integer :max_stock_level, :default => 0
|
||||||
|
t.integer :created_by
|
||||||
|
t.boolean :is_active, :default => true
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
class CreateStockCheckItems < ActiveRecord::Migration[5.1]
|
class CreateStockCheckItems < ActiveRecord::Migration[5.1]
|
||||||
def change
|
def change
|
||||||
create_table :stock_check_items do |t|
|
create_table :stock_check_items do |t|
|
||||||
t.integer :stock_check_id, :null => false
|
t.integer :stock_check_id
|
||||||
t.string :item_code, :null => false
|
t.string :item_code, :null => false
|
||||||
t.integer :stock_count, :default => 0
|
t.integer :stock_count, :default => 0
|
||||||
t.integer :stock_journal_id
|
t.integer :stock_journal_id
|
||||||
|
|||||||
Reference in New Issue
Block a user