Commit Graph

  • 3a69c958ef Hide super admin menu items for enterprise users Maikel Linke 2016-11-30 16:49:06 +11:00
  • 14ee7a06ae Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-12-07 17:03:27 +11:00
  • 6cd8289b27 Correct more typos Maikel Linke 2016-12-02 16:50:54 +11:00
  • d0509b54bf Disabling override the adds coupon field to cart page Rob Harrington 2016-11-30 18:30:20 +11:00
  • ee905cad5f Translation updates Lynne Davis 2016-11-29 15:07:35 +00:00
  • 01efb63ad3 Updating translations for config/locales/en_GB.yml [skip ci] Transifex-Openfoodnetwork 2016-11-30 01:07:53 +11:00
  • 7981feefa1 Updated form to include help tip for clarity Matt-Yorkley 2016-11-28 14:38:13 +00:00
  • d4fd66461e Add retry to flaky specs Rohan Mitchell 2016-11-25 14:37:47 +11:00
  • 071ba5285d Put timecop config in spec support Rohan Mitchell 2016-11-25 14:28:05 +11:00
  • 6795237a2d Put timecop into safe mode and fix leaky Timecop.freeze Rohan Mitchell 2016-11-25 11:18:39 +11:00
  • 57363e2da5 When a product is deleted, touch the supplier and distributors Rohan Mitchell 2016-11-25 10:53:08 +11:00
  • da9a3ce9f3 Refresh products cache when product is deleted (cf. destroyed) Rohan Mitchell 2016-11-25 10:41:04 +11:00
  • c4318030d3 Fix spec: Second visit doesn't actually reload the page Rohan Mitchell 2016-11-04 16:52:43 +11:00
  • 44a301edb1 When touching distributing enterprises, do not touch self -> infinite recursion Rohan Mitchell 2016-11-04 16:04:13 +11:00
  • dabac50128 Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products Rohan Mitchell 2016-10-28 17:44:29 +11:00
  • 6030e9a294 Cache enterprise supplied and distributed properties and producer properties Rohan Mitchell 2016-10-28 17:27:07 +11:00
  • 9b656eaf4f Property / ProducerProperty changes update distributor enterprise cache Rohan Mitchell 2016-10-28 17:26:35 +11:00
  • 22080a9a08 Property / ProducerProperty changes update supplier enterprise cache Rohan Mitchell 2016-10-28 17:21:58 +11:00
  • d93fe3cf2c Cache enterprise supplied and distributed taxons Rohan Mitchell 2016-10-28 16:34:01 +11:00
  • 1ea4f4274c Add enterprise cache invalidation for order cycle changes Rohan Mitchell 2016-10-28 16:33:27 +11:00
  • bd11c6ce14 New hash style Rohan Mitchell 2016-10-28 16:31:42 +11:00
  • e8848451a5 Spacing Rohan Mitchell 2016-10-28 16:26:27 +11:00
  • f4f38b4183 Re-apply shop property filters - including performance regression Rohan Mitchell 2016-10-14 09:56:40 +11:00
  • 27283c50b8 Customers service clears array fo each #index request Rob Harrington 2016-11-25 12:43:48 +11:00
  • 3e77534dcf Product variant form script Matt-Yorkley 2016-11-25 01:31:45 +00:00
  • 5e214a32b3 Moving ShippingMethods service to admin.resource module Rob Harrington 2016-11-25 10:16:08 +11:00
  • 7498b7f098 Moving PaymentMethods service to admin.resource module Rob Harrington 2016-11-25 10:09:07 +11:00
  • 268c8dbcdd Moving Customers and CustomerResource services to admin.resource module Rob Harrington 2016-11-25 09:59:32 +11:00
  • dbbd52cace Fixing broken taxons filter on bulk product edit Rob Harrington 2016-10-28 11:44:26 +11:00
  • 1770a67cd9 Adding #load function to services for resources, for generic loading of data into byID and pristineByID Rob Harrington 2016-09-18 13:42:52 +10:00
  • 3678d4d018 Creating new 'resources' module for holding interdependent ngResource services Rob Harrington 2016-08-21 21:07:46 +10:00
  • 3de69987e6 Changing convention for angular resource services to generic 'byID' object and 'all' array Rob Harrington 2016-08-20 19:57:31 +10:00
  • cbbb047fc1 Expunge all mentions of includeBlank and blankOption from angular services Rob Harrington 2016-09-18 11:06:59 +10:00
  • 338d3cbc38 Delete old commented code Maikel Linke 2016-10-19 15:49:27 +11:00
  • 4c438ff101 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into shop-navigation-directive Maikel Linke 2016-11-25 10:24:42 +11:00
  • 631b19084a Fix intermittent failure via FK when deleted taxon is primary taxon on p2 Rohan Mitchell 2016-11-25 09:37:05 +11:00
  • 63e815c7fc Correct spelling of further in translations Levent Ali 2016-11-24 08:31:01 +00:00
  • b7e9ffc9da Fix enterprise user being denied access to admin when spree dash configured (as on production) Rohan Mitchell 2016-11-24 13:35:49 +11:00
  • d8ce0e7d58 A user without enterprises does not have access to the dashboard, so it's not meaningful to spec Rohan Mitchell 2016-11-24 13:35:04 +11:00
  • a115f2a268 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-11-23 15:00:02 +11:00
  • c0c8b07add Let shopping tabs listen to URL changes Maikel Linke 2016-11-11 17:11:39 +11:00
  • 5913004e14 Fix datepicker error parsing date Rohan Mitchell 2016-11-09 11:47:57 +11:00
  • f4034b1065 Fix spec Rohan Mitchell 2016-09-16 11:52:42 +10:00
  • db93b74490 Refactoring ofnSelect2, works with multiple, and with promised data Rob Harrington 2016-08-31 17:21:49 +10:00
  • d574b8943b WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM Rohan Mitchell 2016-08-31 17:21:06 +10:00
  • 46fcf7b62e Fix enterprise group save error - initialise address correctly Rohan Mitchell 2016-08-31 16:29:48 +10:00
  • 3e565ad7cb Mark admin enterprises form dirty when property removed Rohan Mitchell 2016-08-31 15:40:21 +10:00
  • 0e01350107 Use jquery-migrate instead of downgrading jQuery to access $.browser Rohan Mitchell 2016-06-10 15:22:38 +10:00
  • 7d79fffa33 Reinstate Spree::PaymentMethod::DISPLAY (removed in Spree but used by us) Rohan Mitchell 2016-06-10 12:21:10 +10:00
  • 4117b32ebd Fix specs: We had no permission to update the specified supplier (how did this ever work?) Rohan Mitchell 2016-06-10 12:15:35 +10:00
  • 7a68cc7da1 Remove spec for product distributions Rohan Mitchell 2016-06-10 12:14:47 +10:00
  • 20e6b703d9 Rewrite alias_method to alias_method_chain Rohan Mitchell 2016-06-10 12:13:02 +10:00
  • a1535d6c04 Catch flash messages after fadeout Rohan Mitchell 2016-06-10 12:12:36 +10:00
  • f33df883a0 Fix link_to_remove_fields - does not immediately delete the field Rohan Mitchell 2016-06-10 11:24:23 +10:00
  • 48acf80c85 Fix tabbing Rohan Mitchell 2016-06-10 11:02:49 +10:00
  • d8f8c0df16 Fix API auth: Need Spree::Api::UsersController for authorise_api action to work Rohan Mitchell 2016-06-10 10:34:09 +10:00
  • 8ce917a422 Work around click obscuration Rohan Mitchell 2016-06-08 16:45:29 +10:00
  • 6546d2763b Add Spree::Money#to_html (from Spree 2.0) Rohan Mitchell 2016-06-08 16:21:33 +10:00
  • d3a3b2da9a Pin jquery-rails to 2.1.4 (older version) to prevent missing $.browser errors Rohan Mitchell 2016-06-08 15:32:56 +10:00
  • fdd6400cb8 Fix perms for API soft delete Rohan Mitchell 2016-06-08 15:14:24 +10:00
  • 225e436293 Update included tax param before loading resource Rohan Mitchell 2016-06-08 14:56:41 +10:00
  • 0e354f8fc1 Remove unused currency config vars: decimal_mark, thousands_separator Rohan Mitchell 2016-06-08 14:56:30 +10:00
  • a6a0bdb063 Sanitize values before they're used Rohan Mitchell 2016-06-08 14:44:47 +10:00
  • 6753320336 Do not stomp address on create Rohan Mitchell 2016-06-08 16:27:54 +10:00
  • a3b91dabe5 TEMP: Remove override for no-longer-present method Rohan Mitchell 2016-05-20 16:27:23 +10:00
  • 257441c9be Re-add object-level auth to Spree::Admin::ResourceController Rohan Mitchell 2016-05-20 16:26:54 +10:00
  • 1497d2c3bb Remove missing call Rohan Mitchell 2016-05-20 16:26:20 +10:00
  • 8f0bc367d0 Include missing helpers Rohan Mitchell 2016-05-20 12:27:45 +10:00
  • 764219b9ed Fix OrderMailer#find_order Rohan Mitchell 2016-05-20 12:27:15 +10:00
  • 7f7ee25e27 Money accessors changed to dollars/cents Rohan Mitchell 2016-05-20 12:26:58 +10:00
  • 1765ba0422 Fix spec dependent on product on_demand Rohan Mitchell 2016-05-20 11:44:16 +10:00
  • 32d2adc8a2 Fix mailers - provide from address Rohan Mitchell 2016-05-20 11:41:04 +10:00
  • d890770104 Order state transition condition removed in Spree Rohan Mitchell 2016-05-20 11:02:27 +10:00
  • 376c4c3e0e Fix factories - base_product and base_variant removed Rohan Mitchell 2016-05-20 11:02:08 +10:00
  • a0b740f52d Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments Rohan Mitchell 2016-05-20 11:01:54 +10:00
  • 0d4c4f20df Fix missing EnterpriseFee::Calculator error Rohan Mitchell 2016-05-13 12:30:10 +10:00
  • ab707cf312 Bundle incremental Spree upgrade Rohan Mitchell 2016-05-13 17:49:55 +10:00
  • 9989b76b7d Integrate from Spree fork: Calculators work against LineItems Rohan Mitchell 2016-05-06 16:42:28 +10:00
  • 04a714426f Integrate from Spree fork: Fix spree issues #3531 and #2210 (patch provided by leiyangyou) Rohan Mitchell 2016-05-06 12:37:53 +10:00
  • b66cf14bcb Merge remote-tracking branch 'origin/master' into transifex v1.8.6 Maikel Linke 2016-10-28 15:21:03 +11:00
  • b78739f777 Updating translations for config/locales/it.yml [skip ci] Transifex-Openfoodnetwork 2016-10-21 22:51:27 +11:00
  • fb08759bec Add more tests Bing Xie 2016-10-21 14:45:04 +11:00
  • a4755865ca Fix customer name Bing Xie 2016-10-21 11:58:50 +11:00
  • 5318aaedcf Fix country id and state in type bug Bing Xie 2016-10-21 11:42:13 +11:00
  • 3e56571e59 Making checkout accordion work with new local storage library Rob Harrington 2016-10-07 13:03:21 +11:00
  • e57a25d05f Replacing local storage library with actively maintained one: grevory/angular-local-storage Rob Harrington 2016-09-21 12:21:11 +10:00
  • b59a1cc232 Using true/false instead of YES/NO for address defaults and billing same as shipping Rob Harrington 2016-09-21 12:08:26 +10:00
  • 720ca17533 Fix the mistake Bing Xie 2016-09-21 10:51:17 +10:00
  • d48b00c77c Fix failed user spec Bing Xie 2016-09-16 18:47:38 +10:00
  • 77f43e3ca7 Refactor setting default addresses Bing Xie 2016-09-16 18:32:03 +10:00
  • 23b8fbbbc7 Update customer's default address Bing Xie 2016-09-16 14:43:14 +10:00
  • b0402daf32 Fix failed customers filter spec Bing Xie 2016-09-16 13:57:57 +10:00
  • 079788b4eb Add customer preferred bill and ship address Bing Xie 2016-09-16 13:56:40 +10:00
  • 21ed37189a Only search customers in user managed enterprises Bing Xie 2016-09-16 12:11:59 +10:00
  • 80d755da0d Convert state_id and country_id in serializer Bing Xie 2016-09-16 10:55:11 +10:00
  • 8d534041b2 Refactor js CurrentOrder Bing Xie 2016-09-08 18:46:58 +10:00
  • e91c313f1e Fix state_id and country_id type bug Bing Xie 2016-09-08 15:40:50 +10:00
  • 2f241485a2 Set default addresses for user or customer Bing Xie 2016-09-08 13:50:34 +10:00
  • f14ca87eb5 Set new address for user Bing Xie 2016-09-08 13:10:27 +10:00
  • 1caf648fe5 Move customer search to directive Bing Xie 2016-09-07 12:52:11 +10:00