Maikel Linke
ef0d6bd4d6
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into state_translation_override
...
Conflicts:
spec/lib/open_food_network/order_cycle_management_report_spec.rb
2016-04-15 08:27:09 +10:00
Rohan Mitchell
53e6d391e3
Fix intermittent fail on insignificant result ordering
2016-04-14 09:40:55 +10:00
Maikel Linke
a2c58c7ca1
Match array without order in ocm spec
...
That spec was randomly failing.
2016-04-13 16:59:54 +10:00
Maikel Linke
0ac87b9e55
Override spree_i18n payment_state, shipment_state
2016-04-13 16:50:01 +10:00
Rohan Mitchell
59b564c4be
Report job queue status via API
2016-04-13 16:48:24 +10:00
Rohan Mitchell
193580d5d9
Enqueue jobs directly via SQL rather than loading full Rails stack
2016-04-13 16:48:24 +10:00
Rohan Mitchell
eb846e27fd
Run a job queue heartbeat every 5 minutes
2016-04-13 16:48:24 +10:00
Maikel Linke
e3ed831e30
Merge branch 'state_translation_override' of https://github.com/stveep/openfoodnetwork into state_translation_override
2016-04-13 16:42:28 +10:00
Maikel Linke
e6b1d545a3
Merge branch 'default-logos' of https://github.com/bingxie/openfoodnetwork into default-logos
2016-04-13 15:12:01 +10:00
Steve Pettitt
b79b0d7586
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/state_translation_override
2016-04-11 22:31:56 +01:00
Steve Pettitt
39e3374ece
Add comment
2016-04-11 22:27:47 +01:00
Steve Pettitt
27fdfb60af
Override incorrect Spree GB translations for state/county
2016-04-09 09:41:21 +01:00
Bing Xie
852dce2dff
Add default logos and home_hero
2016-04-08 14:41:44 +10:00
Maikel Linke
b050f27a84
Default logos for new installations
2016-04-06 16:10:32 +10:00
Rob Harrington
44077a2c6f
Fixing styling (bottom margin for save-bar) on inventory page
2016-04-06 15:43:55 +10:00
Rob Harrington
0ed97d820c
Removing unrequired Spree::Order#with_payment_method_name scope
2016-04-02 01:04:09 +11:00
Rob Harrington
9b5bfdeb00
Allowing Order Management Report to filter by multiple payment / shipping methods at once
...
Also switched to using id rather than name to filter
2016-04-02 01:04:09 +11:00
Lynne Davis
f8e3f29d1a
More bug fixes. Spec updated to reflect changes
2016-04-02 01:04:09 +11:00
Lynne Davis
d844dc8e1b
Bug fixes to Order Cycle Reports
2016-04-02 01:04:09 +11:00
Rob Harrington
6c5aaef86e
Removing ability to create order discount rules
...
Issue with application of tax to discounted items is yet to be resolved
2016-04-01 21:31:36 +11:00
Rob Harrington
d8c17d160a
Applying shipping method rules in checkout
2016-04-01 19:48:25 +11:00
Rob Harrington
c099711f97
Removing dialogOptions library, not required anymore
2016-04-01 19:48:25 +11:00
Rob Harrington
d278b72289
Updating Tag Rules UI to allow management of new FilterShippingMethods rule type
2016-04-01 19:48:25 +11:00
Rob Harrington
82bc26fe90
Splitting tag rule feature specs out into their own spec file
2016-04-01 19:48:25 +11:00
Rob Harrington
47df106237
Refactor tragsWithTranslation directive to handle dynamic attr names
2016-04-01 19:48:25 +11:00
Rob Harrington
f70b1f4572
Refactoring tag rule model and adding new rule type: FilterShippingMethod
2016-04-01 19:48:25 +11:00
Rob Harrington
ed134bac84
Removing unrequired initSelection option from ofn-select2
2016-04-01 19:48:25 +11:00
Rob Harrington
33aad10e73
Adding dialogOptions library for adding responsiveness to jquery dialog
2016-04-01 19:48:25 +11:00
Rob Harrington
3d78b375c6
Moving angularjs tag rule logic into its own module
2016-04-01 19:48:25 +11:00
Rob Harrington
f9acee2be4
Shipping methods can be tagged
2016-04-01 19:48:25 +11:00
Rob Harrington
86c80124fc
Moving tags-with-translation directive to admin.utils
2016-04-01 19:48:25 +11:00
Rob Harrington
443e232ea4
Renaming angular admin.shipping_methods and admin.payment_methods modules
2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e
Renaming shippingMethodCtrl to shippingMethodsCtrl
2016-04-01 19:48:25 +11:00
Rob Harrington
f902474591
Relevant DiscountOrder tag rules are applied to orders on update
2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b
Tag Rules can be deleted
2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf
Enterprise users can create tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f
First cut at an interface for updating tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
3aea387b9a
First iteration of a model for tag rules
2016-04-01 19:44:17 +11:00
Maikel Linke
d12c486dd2
Use new spree_paypal_express branch to hide password
2016-04-01 15:48:21 +11:00
Maikel Linke
97bcbb81b9
Change text of register call in the dropdown
...
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
2016-04-01 14:39:43 +11:00
Maikel Linke
04f661f646
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops
...
Conflicts:
config/locales/en.yml
2016-04-01 13:02:53 +11:00
Maikel Linke
c4f92fd4cc
Hide closed shops by default, add "show" button
2016-04-01 11:45:24 +11:00
Maikel Linke
813dff8af2
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login
2016-04-01 11:04:36 +11:00
Maikel Linke
db0b345241
Add "Show all on map" button under shops
2016-03-31 15:24:43 +11:00
Maikel Linke
21be27d722
Remove duplicate filtering of visible enterprises
...
Increase readability of enterprises_controller.js.coffee.
2016-03-31 15:00:22 +11:00
Maikel Linke
3d31a37dd3
Remove unused method Enterprise::find_near
2016-03-31 15:00:22 +11:00
Maikel Linke
17f168ed06
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances
...
Applied code conventions.
Conflicts:
config/locales/en.yml
2016-03-30 13:30:44 +11:00
Maikel Linke
de35940341
Apply coding standards
2016-03-30 09:45:45 +11:00
stveep
d67db76b88
Formatting credit/debit green/red
2016-03-28 20:35:14 +01:00
stveep
5a6caa294e
Revert to Arel query and separate filtering
2016-03-28 20:13:30 +01:00
