luisramos0
1ce431b671
Reorganize code in EnterpriseFeeApplicator
2018-10-02 23:39:31 +01:00
Luis Ramos
08104c62be
Merge pull request #2667 from luisramos0/2-0-ship-method-last-used-address
...
[Spree Upgrade] Adapt Address_Finder.last_used_ship_address to spree 2
2018-09-24 15:07:27 +01:00
Luis Ramos
0eb2854f8a
Merge pull request #2680 from luisramos0/2-0-stable-x
...
[Spree Upgrade] Fixed inexistent order#shipping_method= in several specs
2018-09-24 15:07:04 +01:00
Pau Pérez Fabregat
99ba9d7d1b
Merge branch '2-0-stable' into unit-test-variant-stock
2018-09-19 15:41:21 +02:00
Pau Perez
314ad5400f
Move variant_stock.rb to concerns/
2018-09-18 12:18:50 +02:00
luisramos0
75656668cd
Fixed query in order_cycle_management_report and fixed the respective spec by setting shipping_method in order through shipments
2018-09-17 00:51:01 +01:00
luisramos0
2da7cc00f8
Fixed Address Finder last_used_ship_address. It now uses order.shipments.shipping_methods instead of order.shipping_method
2018-09-14 16:43:20 +01:00
luisramos0
145b4385a4
Fixed db:load_sample_data shipping_method build
2018-09-11 22:21:43 +01:00
Pau Perez
8d8670bdf4
Fix typos in comments
2018-09-10 14:26:19 +02:00
Pau Perez
cd53ec1a4f
Replace exception with DB uniqueness constraint
...
By forbidding more than a row per variant in the spree_stock_items we
can ensure all variants have a single stock_item associated.
2018-09-06 13:21:22 +02:00
Pau Perez
8848af15ee
Raise when a variant has more than a stock item
...
This means we violated the business rules of having a single stock
location for the OFN instance and hence a single stock item per variant.
Although it is too late to preserve the data integrity we can know data
needs to be cleaned up.
2018-09-06 13:20:52 +02:00
Pau Perez
59883f9509
Add deprecation warnings for VariantStock methods
...
This will prevent other devs from relying on this methods and will tell
us the exact lines that call this methods, which will come in handy when
removing this module.
2018-09-06 13:20:52 +02:00
Pau Perez
fc5882686a
Add unit tests to VariantStock
...
This also replaces the after_save callback to after_update.
We enforce a stock_item exists when modifying the variant and the
stock_item gets created on variant's after_create. This means it's not
possible to use any of the VariantStock's setters before the variant is
persisted so executing the callback on creation is pointless.
2018-09-06 13:20:52 +02:00
luisramos0
89d51d75ae
Merge branch 'master' into 2-0-stable-sept
2018-09-04 17:43:20 +01:00
Maikel Linke
c7648d67bd
Add Variant stock API of Spree 1
2018-08-30 13:55:12 +10:00
Maikel Linke
9dcbd9076e
Override in_stock? to prepare for Spree 2.0
2018-08-09 14:22:43 +10:00
Maikel Linke
b84e524f2d
Prepare inventory report for Spree upgrade
...
This change could impact the performance of the report. But therefore it
takes VariantOverrides into consideration. The old code ignored the
distributor for this filter. It also ignored the `on_demand` flag.
2018-08-09 14:22:43 +10:00
Maikel Linke
289d0b937f
Style ScopeVariantToHub
2018-08-09 14:22:43 +10:00
Rob Harrington
0afa9fae8e
Check authorisation before attempting to charge credit cards on order cycle close
2018-07-05 19:26:12 +10:00
Rob Harrington
45895e9924
Use the user's default card to pay for subcriptions
2018-07-05 19:26:11 +10:00
Frank West
8324b00999
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
2018-06-19 17:51:23 +10:00
Rob Harrington
c72a2fda91
Use placed_at state to determine whether to remove orphaned proxy orders
2018-06-13 13:46:11 +10:00
Rob Harrington
d9ddad554e
Prevent proxy_orders for active or complete order cycles from being removed automatically by ProxyOrderSyncer
2018-06-13 13:46:11 +10:00
Rob Harrington
ac309ffaf5
Rename obsolete_proxy_orders to orphaned_proxy_orders
2018-06-13 13:46:11 +10:00
Matt-Yorkley
4e97445655
PI inventories timestamps
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867
PI timestamps
2018-05-26 19:34:19 +01:00
Maikel Linke
7f8f935017
Shorten module referencing
2018-05-18 11:27:48 +10:00
Maikel Linke
0fa9ca653e
Move duplicate code into its own module
2018-05-18 11:27:48 +10:00
Maikel Linke
8e2aee71da
Compile Order Cycle Management only on search
2018-05-18 11:27:48 +10:00
Maikel Linke
7a546087b2
Compile Packing report data only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
1e80487afc
Compile Order And Distributors only on search
...
And move most logic into the report class like the others.
2018-05-18 11:27:47 +10:00
Maikel Linke
53436024e2
Compile Orders & Fulfillment report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
feb33c3ca5
Compile Payments report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
bf74282e5f
Compile Bulk Co-Op report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
5f9d239f19
Compile Products & Inventory report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
d464216027
Don't compile Sales Tax report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
b8ca37e9d2
Don't compile xero report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
14e7cdd138
Don't compile customers report data before search
...
Distributors, suppliers and order cycles are still loaded for the search
form.
2018-05-18 11:27:47 +10:00
Maikel Linke
8393b1d4c0
Don't compile user-enterprises report before search
2018-05-18 11:27:47 +10:00
Frank West
91351c3f78
Confirm first user when seeding database
...
Currently the first user is not confirmed until running the task
`openfoodnetwork:dev:load_sample_data`. This task does not need to be
run on a minimum implementation of a new server or development setup.
We now confirm the first user during seeding. This could be the default
email address or the user entered email address entered during seeding.
2018-05-14 15:30:04 -07:00
Daniel Dominguez
9d9a974295
Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.
...
- Change FactoryGirl to FactoryBot everywhere on code.
2018-05-04 11:52:08 -03:00
Pau Pérez Fabregat
8713bacfab
Merge pull request #2260 from coopdevs/improve-report
...
Improve order_and_distributor report's readability
2018-05-03 16:52:16 +02:00
Pau Perez
5da9b55cdd
Improve order_and_distributor report's readability
2018-05-02 12:26:42 +02:00
Pau Perez
11081ab1d6
Autocorrect Rubocop's Layout/CommentIndentation cop
2018-04-23 12:51:09 +02:00
Pau Pérez Fabregat
1abfe2ab8c
Merge pull request #2199 from coopdevs/auto-correct-cops
...
Auto correct cops
2018-04-16 14:58:28 +02:00
Pau Perez
147a74f005
Fix Rubocop violations reported by Code Climate
2018-04-16 10:27:44 +02:00
Pau Perez
394fb91dd5
Auto correct Rubocop's Layout/MultilineArrayBraceLayout cop
2018-04-09 18:47:18 +02:00
Pau Perez
33ea2c0b07
Auto correct Rubocop's Layout/FirstParameterIndentation cop
2018-04-09 18:47:18 +02:00
Pau Perez
f5a5d735fd
Auto correct Rubocop's Layout/EmptyLinesAroundModuleBody cop
2018-04-09 18:47:18 +02:00
Pau Perez
6593dea4f6
Auto correct Rubocop's Layout/EmptyLinesAroundMethodBody cop
2018-04-09 18:47:17 +02:00
