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
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
Pau Pérez Fabregat
87329ad729
Merge pull request #2092 from ltrls/fix-tax-admin-order-show
...
Fix incorrect tax on Admin Order Show
2018-04-03 08:36:10 +02:00
Pau Pérez Fabregat
d422283b76
Merge pull request #2128 from mkllnk/2113-i18n-config
...
2113 Display only selected languages in switcher
2018-03-23 15:06:47 +01:00
Pau Pérez Fabregat
1005c299a2
Merge pull request #1464 from Matt-Yorkley/uk/bep_images
...
Uk/bep_images
2018-03-23 12:40:16 +01:00
Pierre de Lacroix
03de6c690c
Fix incorrect tax amount on Admin Order #show
...
by calling Order#tax_adjustment_totals from
Order#price_adjustment_totals
2018-03-20 12:18:09 +01:00
Maikel Linke
01dc51c84b
Consistent reference of the source locale
2018-03-13 10:25:31 +11:00
Maikel Linke
64063f305b
Describe methods of I18nConfig
2018-03-13 10:24:42 +11:00
Maikel Linke
db61a2bb17
Parse available language string more relaxed
...
Splitting the string with any whitespace makes it more likely the code
knows what the human meant. It also makes `strip` obsolete, since there
can't be any whitespace within the splitted strings.
2018-03-09 19:41:49 +11:00
Maikel Linke
7a34c6e3f0
Introduce I18nConfig as single point of truth
...
It will be used in application.rb and views.
See https://github.com/openfoodfoundation/openfoodnetwork/issues/2113
2018-03-09 17:45:03 +11:00
Rob Harrington
2bfa923fe1
Use a hash instead of an array :face_palm:
2018-03-02 15:50:10 +11:00
Matt-Yorkley
24dca5e51f
Add image column to product bulk edit
2018-02-14 13:46:05 +00:00
Rob Harrington
04e48989c9
Replace references to 'standing order' with 'subscription' (lib)
2018-02-09 14:44:13 +11:00
Rob Harrington
902802594f
Renaming standing order files (lib, spec)
2018-02-09 14:44:13 +11:00
Rob Harrington
c5f3249172
Fix rubocop issues
2018-02-09 14:44:12 +11:00
Rob Harrington
e7eb02dfe3
Reduce cognitive complexity of VariantsController#search
2018-02-09 14:44:12 +11:00
Rob Harrington
ceab1fe16a
Reduce cognitive complexity of StandingOrderPaymentUpdater
2018-02-09 14:44:11 +11:00
Rob Harrington
c1f0a0b514
Reduce congnitive complexity of AddressFinder
2018-02-09 14:44:11 +11:00
Rob Harrington
1bf2f7ad03
Fix a couple of offences pickup up by rubocop
2018-02-09 14:44:09 +11:00
