Commit Graph

  • ac39c93bbf Fix failed js test Bing Xie 2016-09-01 20:29:31 +10:00
  • 63617f80c5 Add confirm when delete customer Bing Xie 2016-09-01 11:50:27 +10:00
  • a94a30f422 Update the orders spec Bing Xie 2016-08-31 15:22:12 +10:00
  • 63dc48a075 Override customer search UI Bing Xie 2016-08-31 14:54:02 +10:00
  • bc798504e0 Add new enterprise customers search API Bing Xie 2016-08-31 14:25:30 +10:00
  • fd32152e88 Search customers in enterprises Bing Xie 2016-08-26 15:36:51 +10:00
  • 1877bea68d Customer serializer without tag_rule_mapping option Bing Xie 2016-08-26 15:16:57 +10:00
  • f7523ad88c Create customer with default name and addresses Bing Xie 2016-08-24 15:10:40 +10:00
  • ae2357d309 Edit customer address with first name and last name Bing Xie 2016-08-24 15:00:51 +10:00
  • 8afbdcaf79 Move phone down Bing Xie 2016-08-24 12:31:08 +10:00
  • 3e590f92ff Set default billing address and shipping address Bing Xie 2016-08-19 14:51:13 +10:00
  • a6cfa061e4 Fix ship_address_same_as_billing checkbox value with string Bing Xie 2016-08-18 15:29:16 +10:00
  • d59db1cd97 Merge remote-tracking branch 'origin/master' into uk/delivery-address Maikel Linke 2016-10-19 11:01:24 +11:00
  • 7cfb25ace9 Updating translations for config/locales/en_GB.yml [skip ci] Transifex-Openfoodnetwork 2016-10-15 01:48:24 +11:00
  • 51f97f5b28 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-10-12 13:02:27 +11:00
  • 33d940c736 Updating translations for config/locales/fr.yml [skip ci] Transifex-Openfoodnetwork 2016-10-12 01:03:42 +11:00
  • 08b9b50f33 Re-phrase shop options Maikel Linke 2016-10-07 13:03:31 +11:00
  • 7c3968b64e Hide guest checkout if deactivated Maikel Linke 2016-09-23 15:05:46 +10:00
  • c59cd21698 Add option 'allow guest orders' to enterprise Maikel Linke 2016-09-23 08:36:58 +10:00
  • 92694c729f Move 'shopfront requires login' setting Maikel Linke 2016-09-21 14:00:39 +10:00
  • 7b2b285ba7 Rescue spec fails within enqueue_job matcher Maikel Linke 2016-08-03 12:19:36 +10:00
  • caeb8f08e7 Use link_to with mailto attribute to un-reverse email Maikel Linke 2016-10-05 11:15:26 +11:00
  • 499237715e Auto-merge from CI [skip ci] Continuous Integration 2016-10-05 03:08:43 +11:00
  • 7eb2dfba48 Update delivery report to use shipping address Lynne Davis 2016-10-04 16:56:58 +01:00
  • 815cf16822 Auto-merge from CI [skip ci] Continuous Integration 2016-10-05 01:33:18 +11:00
  • a3722dee80 delete file - fix conflict Lynne Davis 2016-10-04 15:29:57 +01:00
  • 79ea2fd39d Reverse email address Lynne Davis 2016-10-03 16:54:15 +01:00
  • b349c28b9b Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2016-10-02 00:38:02 +10:00
  • 40ca2ccee4 Updating TOS url in confirmation email to refer to content_config Lynne Davis 2016-09-25 14:41:11 +01:00
  • 84b4a9bcbe update to internationalise email address in sell page Lynne Davis 2016-09-25 14:00:11 +01:00
  • 1742367b36 Auto-merged master into issue_1134 on deployment. Maikel 2016-09-22 04:50:28 +10:00
  • 8a1d34e711 Fix for issue 1134 - 'Pack by supplier' report now groups by order rather than last name. Rhodri Karim 2016-09-21 17:59:27 +01:00
  • fba72498e3 Merge remote-tracking branch 'origin/master' into transifex Maikel Linke 2016-09-21 16:36:22 +10:00
  • c533f6a15e Updates to UK translations Lynne Davis 2016-09-19 20:33:58 +01:00
  • 23a216004e Updating translations for config/locales/en_GB.yml [skip ci] Transifex-Openfoodnetwork 2016-09-20 01:02:27 +10:00
  • 7d149ed198 Revert shop property filters - causing 10x slowdown v1.8.5 Rob Harrington 2016-09-18 17:46:43 +10:00
  • e8f96e4818 When a shop is open, only show taxon badges for currently open order cycles Rohan Mitchell 2016-09-16 11:28:23 +10:00
  • 3ca42ae055 Extract ids_to_objs to SerializerHelper Rohan Mitchell 2016-09-16 11:24:47 +10:00
  • c0db23af90 Spree::Taxon.distributed_taxons can be scoped to taxons in open order cycles Rohan Mitchell 2016-09-16 11:13:24 +10:00
  • db583df198 Use inner join for Spree::Taxon.distributed_taxons Rohan Mitchell 2016-09-16 10:50:59 +10:00
  • 306bd25dd9 EnterpriseSerialiser shows current properties for open shops and all properties for closed shops Rohan Mitchell 2016-09-09 14:45:11 +10:00
  • f98b25b719 Add Spree::Property.ever_sold_by Rohan Mitchell 2016-09-09 14:38:56 +10:00
  • 1bc477f6b1 Add ProducerProperty.ever_sold_by Rohan Mitchell 2016-09-09 14:32:33 +10:00
  • c37bf3d077 Rename Property#sold_by and ProducerProperty#sold_by to currently_sold_by Rohan Mitchell 2016-09-09 14:28:05 +10:00
  • 3a2e0b7eff Fix spacing Rohan Mitchell 2016-08-31 12:11:20 +10:00
  • 38c63fc88b Available producer filters update when taxon filter changed Rohan Mitchell 2016-08-31 12:00:55 +10:00
  • 8ec2ebbf94 Swap to using multi-line selectors for property filters - z-index issues with single-line-selectors Rohan Mitchell 2016-08-31 11:32:38 +10:00
  • e00846776e Client-side, always show properties by their presentation, not their name Rohan Mitchell 2016-08-31 10:11:05 +10:00
  • 8339d247f8 Shops on groups page filter by property Rohan Mitchell 2016-08-26 16:22:05 +10:00
  • ed2522f6d2 Explicitly specify supplied or distributed properties for ng filters: properties, propertiesOf Rohan Mitchell 2016-08-26 15:49:43 +10:00
  • 63ef5de0e5 Use short syntax for render partial Rohan Mitchell 2016-08-26 14:19:18 +10:00
  • 38d5682762 Add property filters for shops Rohan Mitchell 2016-08-26 12:43:21 +10:00
  • 4c40219352 Move hubs partials from home to shops, their rightful home Rohan Mitchell 2016-08-26 11:43:23 +10:00
  • 7eeee78c4e WIP: Move hubs partials from home to shops, their rightful home Rohan Mitchell 2016-08-26 11:40:21 +10:00
  • 0760d4cc1f Fixing property filters on shopfront Rob Harrington 2016-09-08 12:15:36 +10:00
  • 261a574da9 Tweaking styling on enterprise change form, and dashboard header row Rob Harrington 2016-09-07 11:13:48 +10:00
  • da55eb6d27 Form for changing enterprise type specifies trial length Rob Harrington 2016-09-07 11:13:05 +10:00
  • be51a55f16 Only display shopfront trial message on dashboard page. Fixes #1120 Rob Harrington 2016-09-02 13:45:49 +10:00
  • b2e14711ac Gateway providers inherit from decorated Gateway and PaymentMethod classes in production v1.8.4.1 Rob Harrington 2016-08-31 12:43:22 +10:00
  • 1059c170d1 Adding require_relative of Gateway decorator in attempt to fix inheritance for Gateway::PayPalExpress Rob Harrington 2016-08-31 11:31:59 +10:00
  • 08465a531d Make properties and propertiesOf filters compatible with both products and enterprises Rohan Mitchell 2016-08-19 15:11:30 +10:00
  • 58e0b95cf6 Show property badges on shops Rohan Mitchell 2016-08-19 12:06:19 +10:00
  • 7b5e8fa603 Rename API field properties to supplied_properties Rohan Mitchell 2016-08-19 11:30:20 +10:00
  • c70993ce75 Find producer properties of items sold by a shop Rohan Mitchell 2016-08-19 10:17:41 +10:00
  • aa6e7cba30 Do not return duplicates with Spree::Property.sold_by Rohan Mitchell 2016-08-19 09:48:12 +10:00
  • 4529ced3f2 Find properties of items sold by a shop Rohan Mitchell 2016-08-10 15:34:47 +10:00
  • 509564819a Remove FlatPercentPerItem calculator for shipping methods and payment methods to reduce confusion Rohan Mitchell 2016-08-26 10:26:50 +10:00
  • 24d0e4fcf8 Update specs for calculator change Rohan Mitchell 2016-08-19 17:58:59 +10:00
  • 308c24caf4 Add FlatPercentPerItem calculator for shipping methods, remove FlatPercentItemTotal for enterprise fees (causes shopfront cart discrepencies). Rohan Mitchell 2016-08-19 17:42:55 +10:00
  • 10b076562f Make all calculators use FlatPercentPerItem instead of FlatPercentItemTotal Rohan Mitchell 2016-08-19 17:06:46 +10:00
  • 701c047a0a Move our customisations of FlatPercentItemTotal calculator to a new calc: FlatPercentPerItem Rohan Mitchell 2016-08-19 16:48:32 +10:00
  • fa30e28335 Update spec: Our pricing calculations are now consistent between the frontend and backend carts Rohan Mitchell 2016-08-10 12:42:38 +10:00
  • 5b964ef502 Provide price to calculator to meet new requirements of FlatPercentItemTotal Rohan Mitchell 2016-08-10 12:35:30 +10:00
  • b0eebc2e45 Round FlatPercentItemTotal calcs per-item before summing full quantity Rohan Mitchell 2016-08-10 12:17:10 +10:00
  • 7b2f65a965 Refactor spec so we can have different products in the cart Rohan Mitchell 2016-08-10 10:57:46 +10:00
  • 0dc12d8791 Parameterise add_product_to_cart spec helper method Rohan Mitchell 2016-08-10 10:45:22 +10:00
  • 88b9514090 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-08-24 11:18:41 +10:00
  • e5d7b545c9 I18n and refactoring Bing Xie 2016-08-24 10:43:50 +10:00
  • c4f81b019e Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into sign_up_email_i18n Maikel Linke 2016-08-19 09:27:17 +10:00
  • 528af8759d Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2016-08-19 01:23:43 +10:00
  • c34e9c046b Remove quotes around url Maikel Linke 2016-08-17 16:44:27 +10:00
  • baeabdd668 Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2016-08-12 19:53:12 +10:00
  • 1de2300099 Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2016-08-12 19:07:43 +10:00
  • 53e8056450 Updating translations for config/locales/fr.yml [skip ci] Transifex-Openfoodnetwork 2016-08-12 18:56:13 +10:00
  • 5773876cbc Updating translations for config/locales/fr.yml [skip ci] Transifex-Openfoodnetwork 2016-08-12 17:26:28 +10:00
  • ed1f05e674 Show successful message Bing Xie 2016-08-12 16:31:49 +10:00
  • 98f3e15d87 Updating customer address feature tests Bing Xie 2016-08-12 14:12:09 +10:00
  • 95c152420c Test customer model updating shipping address Bing Xie 2016-08-12 11:55:22 +10:00
  • bdb2b5cce8 Style and i18n the edit address page Bing Xie 2016-08-12 11:15:43 +10:00
  • 22ccbd5556 Required fields validation Bing Xie 2016-08-12 10:49:53 +10:00
  • 81d9ec71d9 Front-end updating address function Bing Xie 2016-08-10 14:49:58 +10:00
  • 45e3f8ab3a Fill the from with model Bing Xie 2016-08-05 20:04:41 +10:00
  • 5b40c745f3 Add address serializer to customer serializer Bing Xie 2016-08-05 16:48:55 +10:00
  • 69addf056b Edit customer address form Bing Xie 2016-08-05 13:23:16 +10:00
  • 34d5df69a5 Fix failed customers controller spec Bing Xie 2016-07-27 15:16:50 +10:00
  • d160142945 Make bill address and ship address as nested attributes Bing Xie 2016-07-27 14:58:42 +10:00
  • 8234956a61 Inject available countries on admin customers page Bing Xie 2016-07-27 14:38:28 +10:00
  • 225bed9990 Add a simple edit address dialog Bing Xie 2016-07-27 14:16:14 +10:00
  • 7f203f5491 Show billing address and shipping address on customers index page Bing Xie 2016-07-20 15:37:59 +10:00
  • add39f7401 Enterprise user can update customer's name Bing Xie 2016-07-15 15:40:44 +10:00