Commit Graph

  • 38efa218d0 Use save bar on order cycle form Bing Xie 2016-04-20 15:31:11 +10:00
  • 8c747f02b5 Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar Rohan Mitchell 2016-05-11 14:41:41 +10:00
  • 6c625297f2 Merge pull request #934 from oeoeaio/uk/trial-length Rob H 2016-05-11 12:36:54 +10:00
  • 8a47d49dfc Auto-merged master into uk/order_cycle_report on deployment. Maikel 2016-05-11 08:20:05 +10:00
  • d5a7e907a3 Fix specs, need to add new for HTML Steve Pettitt 2016-05-10 23:11:14 +01:00
  • 6ecf896fa2 HTML order cycle report email, text customisable in translations Steve Pettitt 2016-05-10 23:04:06 +01:00
  • 6dd989484a Switch to using the Spree GA tracker code Paul Mackay 2016-05-10 05:32:40 +01:00
  • a37820a963 Resize window to fix failed test Bing Xie 2016-05-06 14:55:16 +10:00
  • f90e7d3239 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-05-06 13:58:37 +10:00
  • 08f0011244 Make the page long enough to avoid the save bar overlaying the form Bing Xie 2016-05-06 12:43:50 +10:00
  • 3e231da472 Translate subjects of enterprise emails Maikel Linke 2016-05-06 11:13:15 +10:00
  • 064e3c426e Make the save bar look better Bing Xie 2016-05-06 11:00:34 +10:00
  • f0b80b47f1 Auto-merge from CI [skip ci] Continuous Integration 2016-05-05 23:23:34 +10:00
  • 22a6661b51 Improved layout and image for 404 and 500 error pages Paul Mackay 2016-05-05 14:21:16 +01:00
  • 7f1fc56f78 Change to use total rather than display_total (which returns a Spree::Money object) Steve Pettitt 2016-05-04 07:58:23 +01:00
  • 3cac9c452f Tweaks Bing Xie 2016-05-04 14:48:15 +10:00
  • 57ec7bb9a9 Remove unused test code Bing Xie 2016-05-04 12:27:24 +10:00
  • 8b5e5105a8 Fix failed tests Bing Xie 2016-05-04 12:11:03 +10:00
  • 1833f0dd5d Add save_bar to the order cycles simple editing form Bing Xie 2016-05-04 11:22:25 +10:00
  • 019e16c5ba Update AdminEditOrderCycleCtrl unit tests Bing Xie 2016-05-03 22:58:09 +10:00
  • 885d489bc3 Fix failed test for the default form Bing Xie 2016-04-29 15:23:19 +10:00
  • 63b644551c Keep the action with save button Bing Xie 2016-04-29 10:43:28 +10:00
  • 70ce58f5e1 Tweak save_bar css Bing Xie 2016-04-27 13:47:04 +10:00
  • 33d0f9fc1b Use save_bar on order cycle update form Bing Xie 2016-04-27 12:16:13 +10:00
  • 00858656b5 Extend save_bar directive to support more buttons Bing Xie 2016-04-27 12:15:20 +10:00
  • ef0e41e624 Use save bar on order cycle form Bing Xie 2016-04-20 15:31:11 +10:00
  • a11696b85e Include BugHerd script only if configured, and with configured API key Rohan Mitchell 2016-05-04 12:13:03 +10:00
  • 9ac6de4215 Admin can set bugherd API key Rohan Mitchell 2016-05-04 11:42:07 +10:00
  • bed7ec5953 Add total to producer emails Steve Pettitt 2016-05-01 12:59:55 +01:00
  • 1d7308bf5d More intuitive logic for minimum billable turnover Rob Harrington 2016-04-29 17:18:35 +10:00
  • 4d6a21254f Merge remote-tracking branch 'origin/master' into openstreetmap-tiles v1.7.0 Maikel Linke 2016-04-29 16:40:54 +10:00
  • fa5fa9e228 Auto-complete tags on customers page Maikel Linke 2016-04-29 12:33:33 +10:00
  • 36a4aab020 Adjust styling to blend Rohan Mitchell 2016-04-29 15:07:55 +10:00
  • 42a327211e Merge branch 'openstreetmap-tiles' of https://github.com/bingxie/openfoodnetwork into openstreetmap-tiles Rohan Mitchell 2016-04-29 14:36:47 +10:00
  • 88e9eb59cf Do not allow invalid quantity to reach model, triggering server update Rohan Mitchell 2016-04-29 11:56:48 +10:00
  • 65895752da Remove cruft Rohan Mitchell 2016-04-29 11:49:30 +10:00
  • 8996acf314 Fix spec Rohan Mitchell 2016-04-27 15:25:05 +10:00
  • 1384140e41 Notify when stock limit reached on cart rather than silently capping Rohan Mitchell 2016-04-27 15:10:54 +10:00
  • 1220ff8a06 Notify when stock limit reached on shopfront rather than silently capping Rohan Mitchell 2016-04-27 15:05:44 +10:00
  • f691636c75 Fix spec Rohan Mitchell 2016-04-27 14:47:45 +10:00
  • 824a29624f Tweak the map UI Bing Xie 2016-04-27 14:17:29 +10:00
  • daa5b00a2a Uses openstreetmap tiles Bing Xie 2016-04-15 12:22:17 +10:00
  • 36f4df2931 Allow max value in cart of what's on hand Rohan Mitchell 2016-04-27 12:27:20 +10:00
  • cf40e0432a When cart is updated with insufficient stock, show amount in cart, not amount entered Rohan Mitchell 2016-04-27 12:22:51 +10:00
  • 8f8a1191cb Remove stock cap on max_quantity Rohan Mitchell 2016-04-22 11:44:04 +10:00
  • 2b921542a5 Code styling Steve Pettitt 2016-04-26 04:24:44 +01:00
  • ad6037ac63 Fix user spec, check config is set Steve Pettitt 2016-04-26 04:21:50 +01:00
  • 43d6e49c3a Fix spec Steve Pettitt 2016-04-26 03:31:56 +01:00
  • 53d50f16d6 Merge current master Steve Pettitt 2016-04-26 03:18:27 +01:00
  • 7f38f1dd1c Exclude Accounts & Billing distributor Steve Pettitt 2016-04-26 03:14:13 +01:00
  • 2367b73d3a Revert "Associate new users with existing customer records" Maikel Linke 2016-04-22 14:53:08 +10:00
  • 23e598f2f8 Destroy customer without flash notice Maikel Linke 2016-04-20 14:45:22 +10:00
  • 7bec139987 Auto-merged master into products-caching-add-to-cart on deployment. Maikel 2016-04-22 10:58:26 +10:00
  • a26266159c Fix timing issue: change in client-side value during server update Rohan Mitchell 2016-04-22 10:47:20 +10:00
  • 28d40bf27d Fixing font styling on enterprise name in shop product summary Rob Harrington 2016-04-21 21:27:52 +10:00
  • 779be7c5a0 Extract params parsing into single method Rohan Mitchell 2016-04-21 16:37:15 +10:00
  • 6cba935a65 Add close button to out of stock modal Rohan Mitchell 2016-04-21 11:26:30 +10:00
  • 06d7665bf9 Prospective fix for intermittent spec fail Rohan Mitchell 2016-04-21 09:54:56 +10:00
  • 5151779f80 When update is for another line item, still update all stock levels and show warnings Rohan Mitchell 2016-04-14 15:20:44 +10:00
  • 3dcfa810fd Display out of stock banner when viewing cart directly Rohan Mitchell 2016-04-14 11:14:16 +10:00
  • 9b3139dba9 When there's an out of stock product in the cart, visiting the shopfront returns user to the cart Rohan Mitchell 2016-04-12 11:18:03 +10:00
  • b2d78e7df6 Set allow_backorders explicitly for consistency in CI Rohan Mitchell 2016-04-11 08:55:05 +10:00
  • dac90c8003 Fix specs Rohan Mitchell 2016-04-11 08:42:03 +10:00
  • 35117f7af4 Show a modal when available stock levels have reduced Rohan Mitchell 2016-04-08 15:39:25 +10:00
  • 5e39b11c2f Spec out of stock handling for group buy Rohan Mitchell 2016-04-08 11:44:28 +10:00
  • cfe062918b When a variant goes out of stock, disable the input and grey out the row Rohan Mitchell 2016-04-08 11:22:06 +10:00
  • 8695dea0a5 Remove variant from cart when it becomes out of stock Rohan Mitchell 2016-04-08 11:19:34 +10:00
  • 792e17c385 When removing variant from order, if not found then do nothing Rohan Mitchell 2016-04-08 11:17:54 +10:00
  • 6fbbe580c5 After adding an item to the cart, when less quantity available, reduce quantity and reset client-side stock level Rohan Mitchell 2016-03-24 16:41:54 +11:00
  • 8a62d26af4 After adding an item to the cart, when out of stock, remove from cart and reset client-side stock level Rohan Mitchell 2016-03-24 16:24:36 +11:00
  • fee0f90a1b After adding products to cart, return status of cart and available stock levels Rohan Mitchell 2016-03-24 15:48:35 +11:00
  • 292d027498 When adding an item to cart with not enough stock, add as much as we can without erroring Rohan Mitchell 2016-03-24 14:48:13 +11:00
  • a1bcdc616f Extract add-to-cart inputs into partials Rohan Mitchell 2016-03-24 12:05:16 +11:00
  • 17f69bd182 Remove trailing whitespace Rohan Mitchell 2016-03-24 11:56:26 +11:00
  • d45b525497 When there's an out of stock product in the cart, placing order returns user to the cart Rohan Mitchell 2016-03-09 15:33:37 +11:00
  • 243f59c87d When there's an out of stock product in the cart, checkout returns user to cart Rohan Mitchell 2016-03-02 15:23:38 +11:00
  • 9e321a63c0 Don't put master in order cycle - we don't do that no more Rohan Mitchell 2016-03-02 14:56:25 +11:00
  • f986c5898e Updating en-GB file to reflect recent additions (#909) Lynne 2016-04-16 03:23:26 +01:00
  • 8dd2d17cd5 Merge branch 'uk/trial-length' of https://github.com/openfoodfoundation/openfoodnetwork into uk/trial-length Lynne Davis 2016-04-15 18:51:14 +01:00
  • a0e9163d27 Reverting clever syntax since I clearly don't understand it Lynne Davis 2016-04-15 18:50:37 +01:00
  • cc7d27b030 fixing conflicts Lynne Davis 2016-04-15 17:05:18 +01:00
  • cbd0ace098 Code tidying and currency symbol internationalisation Lynne Davis 2016-03-24 16:57:56 +00:00
  • 6884f5533e Missing Specs Lynne Davis 2016-03-17 13:40:25 +00:00
  • 30ed6df38d Adding super admin configuration for the minimum billable turnover functionality Lynne Davis 2016-03-17 12:54:03 +00:00
  • 240be2be0f Updating specs to explore the cases around zero turnover with fixed rate and minimum billable turnover Lynne Davis 2016-03-17 12:36:38 +00:00
  • ae88a9c2e1 Updating spec with minimum_billable_turnover preference Lynne Davis 2016-03-17 12:24:34 +00:00
  • af4c8bee94 Adding preference def for minimum_billable_turnover Lynne Davis 2016-03-17 12:22:27 +00:00
  • 44ac44e1dd Updating Bill Calculator to include a minimum billable turnover. Shopfronts are not charged if their tunrover is under the minimum billable. Lynne Davis 2016-03-17 11:15:06 +00:00
  • 4033a78887 Removing incorrect angular watch Lynne Davis 2016-03-16 14:17:43 +00:00
  • 51629cd0c0 Adding translations for shop front trials Lynne Davis 2016-03-16 12:35:45 +00:00
  • 4fc33c7da2 Fixing wild typo Lynne Davis 2016-03-16 11:38:00 +00:00
  • abfb8149d9 Adding configurable Shop Trial Length in business model Lynne Davis 2016-03-16 11:35:31 +00:00
  • a1ebd18b7c Updating en-GB file to reflect recent additions Lynne Davis 2016-04-15 10:55:31 +01:00
  • 0b820361de Merge master Steve Pettitt 2016-04-15 08:29:52 +01:00
  • fc719230a3 Add failed payments, update spec Steve Pettitt 2016-04-15 08:26:12 +01:00
  • 49febc6333 Store customer email as lower case Maikel Linke 2016-04-15 15:35:43 +10:00
  • 48f1794d70 Allow admin user to create customers Maikel Linke 2016-04-15 14:34:29 +10:00
  • e17b609517 Apply code standards Maikel Linke 2016-04-15 14:31:54 +10:00
  • a25f4fdf44 Associate new users with existing customer records Maikel Linke 2016-04-15 11:57:18 +10:00
  • 831df0b222 Create and delete customers in admin interface Maikel Linke 2016-04-13 15:05:39 +10:00