Commit Graph

  • 29653a5595 Fix spec infinite recursion issue Rohan Mitchell 2015-01-08 14:43:24 +11:00
  • e6368af757 Update reports_spec.rb Matt-Yorkley 2014-11-27 14:15:13 +00:00
  • 2c80be7e9e Update Matt-Yorkley 2014-11-27 14:11:21 +00:00
  • d194e74eda Rohan's suggested changes Matt-Yorkley 2014-11-27 13:38:52 +00:00
  • 3f61a5412c Spec file attempt... Matt-Yorkley 2014-11-27 12:45:53 +00:00
  • 0f3723a923 Added currency symbols to sales tax report Matt-Yorkley 2014-11-24 23:34:02 +00:00
  • bbca674937 Update reports_spec.rb Matt-Yorkley 2014-11-24 12:23:48 +00:00
  • 623882a2a1 Config option for tax rate on shipping Matt-Yorkley 2014-11-24 03:01:00 +00:00
  • 371f966f63 sales tax view Matt-Yorkley 2014-11-23 19:55:03 +00:00
  • be55f461d0 Report: sales tax on orders Matt-Yorkley 2014-11-23 19:51:52 +00:00
  • ca665dc6bc Merge master into producer-emails. Paul Mackay 2015-03-04 19:09:43 +00:00
  • e6591be55c More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page. summerscope 2015-03-04 17:34:24 +11:00
  • 5b6bff1691 Removing bad nasty overrides which are confusing and bad. and nasty. summerscope 2015-03-04 17:20:05 +11:00
  • db2e5e7558 Add an extra class helper summerscope 2015-03-04 17:19:57 +11:00
  • 4867f45ee1 Add an extra style summerscope 2015-03-04 17:19:37 +11:00
  • 47b08269d6 Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails. summerscope 2015-03-04 17:19:24 +11:00
  • 76f234ee4d Order confirmation top page working on header label summerscope 2015-03-04 17:18:55 +11:00
  • 163035dcad Tweaking email template to be more like order confirmation summerscope 2015-03-04 17:18:37 +11:00
  • 503bd8f5dd Merge pull request #400 from victornava/admin-account-link Rohan Mitchell 2015-03-04 16:08:26 +11:00
  • 6e800341c3 Fixes issue #362 Change admin account link to point to account page instead of edit user. Victor Nava 2015-03-04 16:00:46 +11:00
  • b097a62c7a WIP adding variant name logic to the email templates summerscope 2015-03-04 12:37:57 +11:00
  • cfa281478a Adding ability to edit ShippingCategory.temperature_controlled from admin interface Lynne Davis 2015-03-04 12:02:07 +11:00
  • f64684dc48 Tweak responsive heading columns now that container is a bit smaller summerscope 2015-03-04 11:14:29 +11:00
  • 397697d17c Tweak layout. Remove unnecessary row which was messing up the responsive layout for left column on checkout. summerscope 2015-03-04 11:13:58 +11:00
  • c940a34ec9 Created order_cycle_permitted_in helper Liv Galendez 2015-03-03 21:03:01 +11:00
  • fc63d8719c Used order_cycle_permitted_enterprises helper in order cycles row Liv Galendez 2015-03-03 20:53:39 +11:00
  • 7ba366e2a6 Added select for coordinator since there are 2 now Liv Galendez 2015-03-03 20:46:25 +11:00
  • b26c46d7db Removing default false from temp_controlled - shipping categories Lynne Davis 2015-03-03 16:39:55 +11:00
  • 72a568ffad Adding not null to temp_controlled field of shipping_categories Lynne Davis 2015-03-03 16:33:49 +11:00
  • 3ea7ff766a Removing additional merge conflicts Lynne Davis 2015-03-03 16:29:17 +11:00
  • 3d491d7b5e LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report Lynne Davis 2015-02-24 13:43:00 +10:00
  • 1710c8726e Fixing conflict on attempting to rebase and pull Lynne Davis 2015-03-03 16:13:44 +11:00
  • 2a8ba0bf42 Fixing merge conflicts after rebase Lynne Davis 2015-03-03 16:12:07 +11:00
  • 3279003fd3 Updating logic on temperature_controlled lookup Lynne Davis 2015-03-03 09:35:26 +11:00
  • f2a35e219e Updating migration on customers table with extra validation Lynne Davis 2015-03-02 12:59:07 +11:00
  • 39c5f8febe Updating Customer model with validations Lynne Davis 2015-03-02 12:32:28 +11:00
  • 87b1ab9a1a LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report Lynne Davis 2015-02-24 13:43:00 +10:00
  • 85b8adb1aa call to order_cycle_hub_enterprises has no arguments Rob Harrington 2015-03-01 15:33:16 +11:00
  • e8818c5191 Adding a ship address to order in spec Rob Harrington 2015-03-01 12:22:06 +11:00
  • c91699a11e Using @order_cycle.coordinator instead of @coordinator Rob Harrington 2015-02-27 17:22:42 +11:00
  • 8d6c8791bb Only hubs (sells any) are available for selection as outgoing enterprises Rob Harrington 2015-02-25 11:52:09 +11:00
  • 31054c7bf4 Split order_cycle_simple_view logic into index and form scopings Rob Harrington 2015-02-25 11:07:04 +11:00
  • 5563d23beb Rename set_coordinator method to require_coordinator Rob Harrington 2015-02-25 10:32:40 +11:00
  • 8de6f983a2 User must set the coordinator first when creating an order cycle Rob Harrington 2015-02-20 23:57:36 +11:00
  • 53594b3a0f Cannot add unconfirmed enterprises to order cycles Rob Harrington 2015-02-20 13:03:27 +11:00
  • f8619092bd Merge branch 'order-confirmation' into master. Global email tweak - light header, black logo. This updates the order confirmation emails for better content and styling. summerscope 2015-02-27 17:16:35 +11:00
  • 2c2352cd4e Final tweaks to different layout use cases for these emails. summerscope 2015-02-27 17:14:33 +11:00
  • 12bfb9301a More updates dealing with pick up instructions. summerscope 2015-02-27 17:09:59 +11:00
  • ba0d4c2111 More order confirmation email updates. Making language correct for hub vs user. summerscope 2015-02-27 16:55:36 +11:00
  • 4eee86a240 Tweak label summerscope 2015-02-27 16:09:14 +11:00
  • 587e4ae86d WIP getting all the confirmation details right for collection, delivery, etc. summerscope 2015-02-27 16:08:20 +11:00
  • 60c246f104 fixing side menu ng-show of items Maikel Linke 2015-02-27 15:21:23 +11:00
  • 87842ecaf5 More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements. summerscope 2015-02-27 14:00:49 +11:00
  • 2ba632456f WIP email mailer updates for customer email confirmation etc. summerscope 2015-02-27 12:40:13 +11:00
  • 3beff77164 Merge remote-tracking branch 'origin/master' into group-pages Maikel Linke 2015-02-26 17:22:13 +11:00
  • 69fd3f0b60 Fix link to group pages if someone enters "/groups/" instead of "/group" Maikel Linke 2015-02-26 16:41:51 +11:00
  • ff4bd449a2 Setting default_country_id by application.yml Maikel Linke 2015-02-26 16:25:18 +11:00
  • 379b702b9b spec: testing array of owned groups without order Maikel Linke 2015-02-26 16:22:15 +11:00
  • fa4741eb65 Update auto-creation of E2E links: more specific and restricted link creation Rohan Mitchell 2015-02-26 13:47:40 +11:00
  • 1f7aec0c1d group owner select box in own tab Maikel Linke 2015-02-26 13:09:46 +11:00
  • fc7abd5d02 Changing order of tabs at top of shopfront, leaving more room for long shopfront names in about tab summerscope 2015-02-25 16:20:10 +11:00
  • 469b383781 Properties and shopfront filters with taxons WIP. summerscope 2015-02-25 16:04:32 +11:00
  • 15144bdddd WIP search input on shopfront page. summerscope 2015-02-25 13:18:45 +11:00
  • d43f367f30 Shopfront Properties - WIP layout work summerscope 2015-02-25 11:11:09 +11:00
  • 304bde3b9e Working on the filters for shopfront properties and updates. summerscope 2015-02-25 10:46:51 +11:00
  • e9fca885db WIP layout changes for shopfront top summerscope 2015-02-25 10:46:43 +11:00
  • 122cf6c065 Groups index page styling for responsive use cases. summerscope 2015-02-25 10:22:33 +11:00
  • 9daf7e3955 Removing spans on follow icons as these show up as blank spaces when no data to fill. summerscope 2015-02-25 09:38:07 +11:00
  • a3df4bf026 LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report Lynne Davis 2015-02-24 13:43:00 +10:00
  • fdde55f631 Add spec for ext_url filter, refactor Rohan Mitchell 2015-02-23 10:03:03 +11:00
  • f8153c07b1 moving email from "web" to "contact" on group edit page Maikel Linke 2015-02-22 16:20:11 +11:00
  • eade689070 linkToService directive to generate external links Maikel Linke 2015-02-22 16:15:04 +11:00
  • a522242e7a dealing with invalid live data in migration Maikel Linke 2015-02-21 18:43:03 +11:00
  • e05d64a0b4 WIP on groups index page. Needs work from Maikel or Rohan. summerscope 2015-02-20 16:43:36 +11:00
  • 985887334f Tweak the padding between header and tabs. summerscope 2015-02-20 16:43:03 +11:00
  • 3aa06ee1e4 Tabs styling for groups page - making it pretty. summerscope 2015-02-20 16:14:50 +11:00
  • 3ab961a7e2 New mixin for gradients summerscope 2015-02-20 16:14:40 +11:00
  • 60b7a571c5 Tweak styling and markup for contact info in right column. summerscope 2015-02-20 15:35:07 +11:00
  • f8ca24c5cd Index enterprise_groups address_id Rohan Mitchell 2015-02-20 14:56:16 +11:00
  • f58219eb3d Split inputs into separate partials for each fieldset Rohan Mitchell 2015-02-20 11:36:30 +11:00
  • 4554c0555d Change locking to use postgres syntax, fixes 'must be first statement in transaction' error Rohan Mitchell 2015-02-20 11:31:39 +11:00
  • 176db78e64 Extract data fetching from views Rohan Mitchell 2015-02-20 11:17:01 +11:00
  • 98063dae60 setting default country by id in groups controller Maikel Linke 2015-02-19 16:57:19 +11:00
  • c01d45e3af Serialize move_up and move_down methods of groups Maikel Linke 2015-02-19 16:51:58 +11:00
  • d5c2abdd7e stripping "undefined" in after_find and after_save callbacks instead of overriding getters Maikel Linke 2015-02-19 16:33:43 +11:00
  • a7b723af93 owner index for enterprise groups Maikel Linke 2015-02-19 13:23:50 +11:00
  • 6a29b830c2 commenting changes in overridden adaptivemenu.js Maikel Linke 2015-02-19 11:35:06 +11:00
  • 8e83c6679a extended test of owned groups Maikel Linke 2015-02-19 11:25:31 +11:00
  • a0f0b3c93b display only activated enterprises to add to groups Maikel Linke 2015-02-19 11:14:25 +11:00
  • ecd7b16ef5 revert setting default country by name in enterprise controller Maikel Linke 2015-02-19 11:09:43 +11:00
  • 718a5911a3 code style and cleanup Maikel Linke 2015-02-19 10:48:39 +11:00
  • bbac5aa803 Using pure css for styling odd and even menu items Maikel Linke 2015-02-19 10:22:37 +11:00
  • 346a4e71d0 side menu partial does not require showItem defined Maikel Linke 2015-02-19 10:17:58 +11:00
  • f83ceae5d1 Fix feature: Enterprises list is shortened when error in bulk update Rohan Mitchell 2015-02-18 15:32:23 +11:00
  • 08afcac1e5 exposing more group attributes to angular Maikel Linke 2015-02-18 14:55:42 +11:00
  • 9496987da6 Fix display of admin group side menu Maikel Linke 2015-02-18 12:04:17 +11:00
  • 224864a8d8 Merge pull request #385 from openfoodfoundation/empty-cart-typo Rohan Mitchell 2015-02-18 10:59:17 +11:00
  • b9248d3e2c Fixed typo in empty cart error message Liv Galendez 2015-02-18 10:34:23 +11:00
  • 903bd21577 Merge remote-tracking branch 'origin/master' into group-pages-merge Maikel Linke 2015-02-13 15:42:36 +11:00
  • 87686848bc make group contact fields not null Maikel Linke 2015-02-13 15:39:44 +11:00