Commit Graph

  • 6f5080923f Merge pull request #2123 from coopdevs/bring-seeds-from-ofn-install Pau Pérez Fabregat 2018-03-12 11:43:14 +01:00
  • afda5cc04e Merge pull request #2115 from coopdevs/localize-sample-data Pau Pérez Fabregat 2018-03-09 16:18:18 +01:00
  • 12e225e7c0 Add sample addresses in the instance's country Pau Perez 2018-03-06 13:05:14 +01:00
  • c19c22cb17 Apply couple simple tweaks to seeds.rb Pau Perez 2018-03-07 10:51:54 +01:00
  • db61a2bb17 Parse available language string more relaxed Maikel Linke 2018-03-09 19:41:49 +11:00
  • 8017921e89 Use I18nConfig in views Maikel Linke 2018-03-09 17:26:14 +11:00
  • 3743cf1bc3 Use I18nConfig for application defaults Maikel Linke 2018-03-09 16:54:00 +11:00
  • 7a34c6e3f0 Introduce I18nConfig as single point of truth Maikel Linke 2018-03-09 16:38:41 +11:00
  • b5a8df00dd Merge pull request #2117 from coopdevs/confirm-example-user Pau Pérez Fabregat 2018-03-09 07:24:40 +01:00
  • 0aacb91f50 Merge pull request #2116 from coopdevs/clean-sample-data Enrico Stano 2018-03-07 20:58:30 +01:00
  • 1b39d57800 Remove deprecated reference to Spree::MailMethod Pau Perez 2018-03-07 15:56:50 +01:00
  • 5eb3dc4beb Bring states.yml from l10n_au Pau Perez 2018-03-07 10:30:12 +01:00
  • 9849f76c1c Bring seeds.rb from ofn-install Pau Perez 2018-03-07 10:28:34 +01:00
  • ae2eba89ca Automatically confirm the spree@example.com user Pau Perez 2018-03-06 15:25:58 +01:00
  • dadbb7445b Merge pull request #2110 from oeoeaio/subs-summary-hash Rob H 2018-03-07 16:41:38 +11:00
  • 4fd307832e Merge pull request #2120 from oeoeaio/subs-unpause-messaging Rob H 2018-03-07 16:41:00 +11:00
  • 09ca9ac2dd Alter scope to return both completed and resumed orders Rob Harrington 2018-02-22 11:26:19 +11:00
  • b98afc00ba Show message about resumable orders when unpausing a subscription Rob Harrington 2018-02-21 18:56:59 +11:00
  • 7332e21013 Make InfoDialog more flexible (can show information as well as errors) Rob Harrington 2018-02-22 10:47:57 +11:00
  • 5cb0a1c371 Fix position of jQuery dialogs in admin section Rob Harrington 2018-02-22 11:24:10 +11:00
  • 10d6a29503 Move service class to its own file Pau Perez 2018-03-06 13:07:17 +01:00
  • e06af77420 Move from hash rocket to symbol syntax Pau Perez 2018-03-06 12:55:13 +01:00
  • 392d0de6c5 Merge pull request #2055 from HugsDaniel/1766_entreprise_registration_scroll_on_first_step Pau Pérez Fabregat 2018-03-06 11:39:35 +01:00
  • 0fdd7dabd4 Merge pull request #2026 from Matt-Yorkley/uk/embedded_headers Pau Pérez Fabregat 2018-03-06 11:07:32 +01:00
  • c999627d28 Merge pull request #2114 from ltrls/fix-old-rspec-syntax Pau Pérez Fabregat 2018-03-06 11:04:21 +01:00
  • f2eee77a15 fixed modal height and change grid to have button and text side by side Hugo Daniel 2018-02-19 13:17:42 +01:00
  • 040c292a76 Fix some more old rspec syntax Pierre de Lacroix 2018-03-06 01:29:54 +01:00
  • 12e3b88b71 Fix some old Rspec syntax Pierre de Lacroix 2018-02-20 18:20:11 +01:00
  • 2bfa923fe1 Use a hash instead of an array :face_palm: Rob Harrington 2018-03-02 14:31:23 +11:00
  • d30362b78c Merge pull request #2108 from oeoeaio/subs-neg-stock Rob H 2018-03-02 15:47:12 +11:00
  • 28491ee948 Skip stock check when requested quantity is zero Rob Harrington 2018-03-02 12:03:12 +11:00
  • fe4145d9d5 Use expect syntax Rob Harrington 2018-03-02 11:40:20 +11:00
  • 3ef29fde2c Merge pull request #2107 from oeoeaio/subs-missing-close Rob H 2018-03-02 14:52:54 +11:00
  • 05e6c3daa6 Add message to indicate missing orders_close_at date Rob Harrington 2018-03-01 14:03:41 +11:00
  • 9d8456cbf3 Merge pull request #2090 from oeoeaio/subs-styling Rob H 2018-03-02 13:24:05 +11:00
  • 1d8f332cc6 Merge pull request #2096 from oeoeaio/subs-estimates Rob H 2018-03-02 13:22:27 +11:00
  • 6f554814ce Add class documentation for SubscriptionEstimator Rob Harrington 2018-02-23 16:51:54 +11:00
  • f1545a4ab6 Show fee estimates in subscription totals in UI Rob Harrington 2018-02-23 16:42:04 +11:00
  • 31750a7bba Add logic for calculator of fee estimates to SubscriptionEstimator Rob Harrington 2018-02-23 16:36:25 +11:00
  • ad391c73ab Add migration to add fee estimate fields to subscriptions table Rob Harrington 2018-02-23 16:35:19 +11:00
  • 014283447d Use delegate to access subscription shop Rob Harrington 2018-02-23 15:45:57 +11:00
  • 3b2d4ae2d4 Estimator take variant overrides into account Rob Harrington 2018-02-23 15:37:38 +11:00
  • 14a03aab35 Fallback to previous saved estimate if calculator not available Rob Harrington 2018-02-23 15:23:41 +11:00
  • 904a364bf1 Stop unnecessarily passing fee_calculators around Rob Harrington 2018-02-23 14:23:51 +11:00
  • 30df1d4345 Refector controller to allow price_estimate calculation Rob Harrington 2018-02-23 14:18:11 +11:00
  • b85e38010f Delegate responsibility to estimating prices for subscriptions to dedicated service object Rob Harrington 2018-02-23 12:36:22 +11:00
  • 7a411b0452 Updating translations for config/locales/de_DE.yml Transifex-Openfoodnetwork 2018-03-02 03:48:06 +11:00
  • ecbd1fe93d Updating translations for config/locales/pt.yml Transifex-Openfoodnetwork 2018-03-02 02:15:53 +11:00
  • 14caac0212 Merge pull request #2074 from mjal/2057states-are-not-displayed-in-modify-address-pop-in-and-prevent-saving-2 Enrico Stano 2018-03-01 14:59:02 +01:00
  • 6e9efe79b7 Merge pull request #2053 from Matt-Yorkley/uk/enterprise_limit Enrico Stano 2018-03-01 14:40:24 +01:00
  • cff1d7224d Bug fix in customers edit address Maxime Lalisse 2018-02-07 15:38:58 +01:00
  • 86a500bcdf Fix browser caching of updated icon font Matt-Yorkley 2018-02-23 20:49:42 +00:00
  • 7bd0de99ac Adjust brittle referer header check Matt-Yorkley 2018-02-23 16:35:46 +00:00
  • 9506ea456e Stub the request object instead of controller method Matt-Yorkley 2018-01-06 15:37:31 +00:00
  • e173f823c8 Refactor embedded logic Matt-Yorkley 2018-01-05 21:34:26 +00:00
  • 4a818c07bb Only include one host in embedded shopfornt headers Matt-Yorkley 2017-12-23 17:02:23 +00:00
  • 1ac9417a20 Add class description for ProxyOrder Rob Harrington 2018-02-22 16:23:10 +11:00
  • ae1c8344d1 Ensure price estimates generated for subscriptions take overrides into account Rob Harrington 2018-02-21 14:36:26 +11:00
  • add9c83812 Ensure correct price is used by OrderFactory when building line items Rob Harrington 2018-02-21 14:09:10 +11:00
  • 993f02a989 Add knowledge of variant overrides to OrderFactory Rob Harrington 2018-02-21 11:52:26 +11:00
  • d7d40a4a0f Create new OrderFactory service object for initializing order from attr hash Rob Harrington 2018-02-21 11:37:59 +11:00
  • 6bf4ed1ac5 Add new review view to subscription wizard Rob Harrington 2018-02-20 15:33:32 +11:00
  • 6bdbdc06e7 Use select2_search instead of targetted_select2_search Rob Harrington 2018-02-20 15:11:20 +11:00
  • 2e94654f91 Create factory to hold auxillary functions for subscriptions Rob Harrington 2018-02-19 17:44:17 +11:00
  • 2a731b2db5 Rename SubscriptionPrototype to SubscriptionActions Rob Harrington 2018-02-19 17:08:18 +11:00
  • dcfa5fa42d Use services to access injected data arrays Rob Harrington 2018-02-19 16:12:08 +11:00
  • ad62b258ac Populate 'all' array from Schedules#load Rob Harrington 2018-02-19 16:11:21 +11:00
  • 95f70409ee Auto-load customers into service when present Rob Harrington 2018-02-19 16:10:23 +11:00
  • 3ac57269ed Use .all convention for shipping and payment methods resource services Rob Harrington 2018-02-19 13:46:09 +11:00
  • 8951c79f71 Only count future orders in subs index order count Rob Harrington 2018-02-20 15:53:56 +11:00
  • b3e7badd37 Fix incorrect translation key Rob Harrington 2018-02-20 15:45:12 +11:00
  • cec5fddf6a Add missing translation Rob Harrington 2018-02-19 12:32:51 +11:00
  • c4a81bdc48 Translate subscriptions loading flash Rob Harrington 2018-02-19 11:52:36 +11:00
  • 9887819c16 Update ref for ofn-qz Rob Harrington 2018-02-20 16:23:56 +11:00
  • c1b7e9f79e Merge pull request #2069 from HugsDaniel/1889_bug_in_order_cycles_filter_on_customer_admin_reports Pau Pérez Fabregat 2018-02-21 17:11:52 +01:00
  • 3fa5ca7eae Use accessible_by method instead of involving_managed_distributors method to fetch all order cycles Hugo Daniel 2018-02-07 15:56:39 +01:00
  • 65fea6291e CodeClimate requested changes Hugo Daniel 2018-02-06 12:49:03 +01:00
  • 64c2bdda1c Added loading of all active or complete order cycles concerned by the current user to the reports form collection Hugo Daniel 2018-02-06 12:22:46 +01:00
  • de8df4b3e9 Manual update from transifex Maikel Linke 2018-02-21 14:25:19 +11:00
  • 70bb64d58d Manual update from transifex Maikel Linke 2018-02-21 14:24:45 +11:00
  • a529525a63 Manual update from transifex Maikel Linke 2018-02-21 14:24:28 +11:00
  • 50c1224139 Updating translations for config/locales/de_DE.yml Transifex-Openfoodnetwork 2018-02-21 10:59:20 +11:00
  • 927ab3a23a Make subscriptions setup checklist more legible Rob Harrington 2018-02-19 11:11:10 +11:00
  • 183621f90b Merge pull request #2080 from coopdevs/add-skylight-staging Pau Pérez Fabregat 2018-02-15 11:26:16 +01:00
  • fdc14ab44e Add controller specs Matt-Yorkley 2018-02-14 15:25:22 +00:00
  • a7dcaf15fa Enable Skylight in staging Pau Perez 2018-02-14 14:30:22 +01:00
  • 8a11dc3c33 Decouple image upload from Spree Matt-Yorkley 2018-01-06 13:50:05 +00:00
  • 23deb37876 Save/Update product image test Matt-Yorkley 2017-12-31 16:38:53 +00:00
  • 526317c373 BEP Image upload specs Matt-Yorkley 2017-05-06 15:39:39 +01:00
  • 7d27d1325e Bulk Edit image upload Matt-Yorkley 2017-02-22 00:09:54 +00:00
  • 24dca5e51f Add image column to product bulk edit Matt-Yorkley 2017-02-21 22:42:34 +00:00
  • 237854c781 Update enterprise limit error text and use expect sytnax Matt-Yorkley 2018-01-31 15:00:02 +00:00
  • 3c5b01ece0 Update enterprise limit spec Matt-Yorkley 2018-01-23 20:47:18 +00:00
  • d52f9fd43f Add enterprise limit modal Matt-Yorkley 2018-01-23 20:02:55 +00:00
  • 5c046b76f0 Fix failing tests Pierre de Lacroix 2017-09-21 18:33:55 +02:00
  • ab1ed16435 Add a migration to change Spree::Users enterprise_limit default value from 1 to 5 Pierre de Lacroix 2017-09-13 23:01:11 +02:00
  • 689aed7080 Add spec for admin & handling jtruong2 2018-02-12 15:13:32 +01:00
  • 6c92fdf167 fixes issue if admin and handling == 0 then do not render row jtruong2 2018-02-12 15:48:06 +01:00
  • aef73aef38 Add translation keys Maxime Lalisse 2018-02-09 22:14:01 +01:00
  • 11eda94949 Add i18n for admin/orders Maxime Lalisse 2018-02-08 00:13:17 +01:00