Commit Graph

  • b6f29c778e Use haml syntax for defining divs Rohan Mitchell 2015-01-08 10:23:37 +11:00
  • 4839c00d62 Retrieve currency_symbol via private method rather than before_filter + instance var - cleaner syntax Rohan Mitchell 2015-01-08 10:12:27 +11:00
  • a438216189 Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2 Rohan Mitchell 2015-01-08 10:08:12 +11:00
  • 29f9b3bbd7 Merge branch 'Matt-Yorkley-tax_cat_dropdown' Rohan Mitchell 2015-01-08 09:51:27 +11:00
  • ac59665e3c Test validations without creating models in database Rohan Mitchell 2015-01-08 09:48:33 +11:00
  • e4efda2f96 Move model spec into validations block Rohan Mitchell 2015-01-08 09:37:35 +11:00
  • a9b91bc52a Tighten spec: setting tax category should succeed Rohan Mitchell 2015-01-08 09:35:18 +11:00
  • f90ee33c89 Use the tax category factory provided by Spree Rohan Mitchell 2015-01-08 09:27:29 +11:00
  • 087ccb52f9 Merge branch 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown Rohan Mitchell 2015-01-08 09:09:20 +11:00
  • 4bf8716786 Extract complete_checkout to method Rohan Mitchell 2015-01-07 16:29:15 +11:00
  • c0030ddb13 use_short_wait can now take a flexible wait time Rohan Mitchell 2015-01-07 16:28:03 +11:00
  • 370133b875 Fix minor spec issues Rohan Mitchell 2015-01-07 16:06:23 +11:00
  • 3b9657eb17 show map of a group's enterprises Maikel Linke 2015-01-07 12:00:55 +11:00
  • 9956b967f0 Fixing link to group's page Maikel Linke 2015-01-07 10:27:08 +11:00
  • 9310bc902a first draft of group page, a lot of TODOs Maikel Linke 2014-12-18 16:00:54 +11:00
  • 9798b05a24 TabsCtrl can show tabs that don't toggle Maikel Linke 2014-12-18 15:42:56 +11:00
  • 586753015b Reducing the groups page to a oneline list of groups Maikel Linke 2014-12-18 10:25:01 +11:00
  • 67b17de695 #275: Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback. Paul Mackay 2014-12-30 11:33:13 +00:00
  • 6863dd75ef Restyling button for price breakdown to make it more clear that users press again to close the pop over summerscope 2014-12-19 17:05:13 +11:00
  • fafdb29fcb Regenerated icon font, smaller file size and updated graph icon summerscope 2014-12-19 17:04:26 +11:00
  • 85882a73ff Merge branch 'lin-d-hop-266reportsbranch' Rohan Mitchell 2014-12-19 16:51:38 +11:00
  • 2bad590ef4 Order confirmation and order objects use overridden prices Rohan Mitchell 2014-12-19 16:19:56 +11:00
  • c3995ee4d5 Checkout shows overridden prices Rohan Mitchell 2014-12-19 14:43:32 +11:00
  • 94684e9963 Show overridden price in shopping cart Rohan Mitchell 2014-12-19 12:15:58 +11:00
  • 1e1a070b2b Scope Variant#price_in Rohan Mitchell 2014-12-19 12:14:57 +11:00
  • 6f95fa8546 Merge remote-tracking branch 'origin/shopfront-filters' 0.7.2 Rob Harrington 2014-12-19 15:40:01 +11:00
  • 170b14d0f5 Tightening up expectations in shop controller spec Rob Harrington 2014-12-19 15:39:13 +11:00
  • d50f8dcd01 Tweak styling shopfront page to allow for new icons and hover state summerscope 2014-12-19 14:53:46 +11:00
  • 813ef463a2 Tweak markup shopfront page to add icon summerscope 2014-12-19 14:53:25 +11:00
  • a810fc88ac Dedicated new enterprise form Rob Harrington 2014-12-19 12:57:56 +11:00
  • 24cf3dee74 Hiding Shop Preferences in enterprise form Rob Harrington 2014-12-19 12:57:18 +11:00
  • 21e4f40616 Implementing primary taxon ordering on the shopfront Rob Harrington 2014-12-19 11:01:13 +11:00
  • 0fa289a443 Changing shopfront message into an alert box Rob Harrington 2014-12-19 11:00:17 +11:00
  • fcb14f32d2 Validating user input for shopfront taxon order Rob Harrington 2014-12-19 09:33:04 +11:00
  • f145a7ed65 Moving taxons into its own module, adding preferred shopfront taxon order to enterprise Rob Harrington 2014-12-18 16:50:47 +11:00
  • a38e27e504 Adapting taxon autocompleter to allow multiple selection of taxons Rob Harrington 2014-12-18 15:47:20 +11:00
  • 4b353fa27b Ammending comments to make slightly more clear Rob Harrington 2014-12-18 11:01:08 +11:00
  • 9f086facdb Hiding link to shopfront for non-distributors Rob Harrington 2014-12-18 10:28:15 +11:00
  • 2efd905227 Fixing specs to work with text-angular Rob Harrington 2014-12-18 10:24:00 +11:00
  • c5bf228cb9 Removing hashes from side menu links Rob Harrington 2014-12-18 10:23:44 +11:00
  • b18163bfaf Remove separate long description injection, use full enterprise serializer instead Rob Harrington 2014-12-17 16:02:06 +11:00
  • 3fa1832e7b Adding shop closed message preference Rob Harrington 2014-12-17 15:39:32 +11:00
  • d5df73c6a2 Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular Rob Harrington 2014-12-17 15:17:29 +11:00
  • 5a24f2c0e2 WIP: adding shopfront message to shop Rob Harrington 2014-12-17 14:35:11 +11:00
  • 435bc177f8 Hiding side menu elements by filtering rather than by making invisible Rob Harrington 2014-12-17 12:58:00 +11:00
  • a489aa7ad9 Fixing enterprise feature spec, adding first shop preference Rob Harrington 2014-12-17 12:45:41 +11:00
  • 88d49148d4 Adding border to text-angular form element Rob Harrington 2014-12-17 12:10:08 +11:00
  • 33d4f03a99 Adding shop preferences pane, fiddling with icons Rob Harrington 2014-12-10 11:10:30 +11:00
  • 612c8a95b2 Adding icons to enterprise edit side menu Rob Harrington 2014-12-10 10:54:30 +11:00
  • abdcdea1a2 Adding payment methods partial to new enterprirse edit screen Rob Harrington 2014-11-28 16:41:17 +11:00
  • 412b431f36 Fixing up tbody positions Rob Harrington 2014-11-28 16:37:56 +11:00
  • 25e608d9fb Adding shipping methods partial to redone enterprise form Rob Harrington 2014-11-28 16:30:09 +11:00
  • bc32a053f7 Adding global styling class for aligning text to the right Rob Harrington 2014-11-28 16:29:45 +11:00
  • 0ea1adfdff Adding a partial for enterprise fees to enterprise form Rob Harrington 2014-11-28 16:11:15 +11:00
  • 468e83cef7 Adding global centering css class Rob Harrington 2014-11-28 16:10:31 +11:00
  • 76acd706ea Adding ability to show and hide menu items Rob Harrington 2014-11-28 14:38:28 +11:00
  • eb2a6f0ef5 Splitting contact and social into two separate partials Rob Harrington 2014-11-28 12:57:09 +11:00
  • b10d623f26 Rearrange columns for action buttons on enterprise form Rob Harrington 2014-11-28 12:42:18 +11:00
  • f86d4a1996 Pulling headings out of enterprise form partials, displaying each conditionally Rob Harrington 2014-11-28 12:39:24 +11:00
  • d8349bc037 menu refers to SideMenu object Rob Harrington 2014-11-28 12:29:17 +11:00
  • 39ca0ce3dc WIP: Adding a side_menu to the enterprise form Rob Harrington 2014-11-28 12:05:01 +11:00
  • b0c86f83ee Splitting enterprise edit page into partials Rob Harrington 2014-11-28 11:04:51 +11:00
  • b944030994 Add some logic for small screen layout summerscope 2014-12-19 13:11:35 +11:00
  • e9cb7f9565 Styling for clear filters row summerscope 2014-12-19 13:02:17 +11:00
  • f36c881f52 Add clear filters feature to Producers page summerscope 2014-12-19 13:02:07 +11:00
  • e8c5af004f Add another class so we can see which row is clear filters summerscope 2014-12-19 13:01:49 +11:00
  • b55bced488 Put show hide animation back in for clear button summerscope 2014-12-19 12:53:48 +11:00
  • ebe2d99299 Change markup because the boolean variable now works correctly summerscope 2014-12-19 12:53:26 +11:00
  • 515348a8fb Change the filtersActive variable for this page only summerscope 2014-12-19 12:52:57 +11:00
  • 08d37b955a Refactoring filter feature for shopfront page - show by default, hide on click. WIP. summerscope 2014-12-19 12:22:04 +11:00
  • 72118f4e2e Fix syntax error, spec for removed column Rohan Mitchell 2014-12-19 10:01:46 +11:00
  • e9f04c3c15 Clean up whitespace Rohan Mitchell 2014-12-18 17:17:24 +11:00
  • 6e0576235d Use create\! instead of build - more concise, raises exception on error Rohan Mitchell 2014-12-18 17:17:15 +11:00
  • 27d646c0e8 Tweak indentation, remove some blank lines Rohan Mitchell 2014-12-18 17:07:18 +11:00
  • 0151ecbb32 Add additional rows to payment method selection Rohan Mitchell 2014-12-18 17:04:10 +11:00
  • d548515684 Remove unused header column Rohan Mitchell 2014-12-18 17:03:57 +11:00
  • 343af1f1e0 Rename report_shipping_options to report_shipping_method_options for symmetry with report_payment_method_options Rohan Mitchell 2014-12-18 16:54:13 +11:00
  • 3b58d99abc Fix spec failure Rohan Mitchell 2014-12-18 16:38:03 +11:00
  • 4a30f27b3d Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch Rohan Mitchell 2014-12-19 09:38:02 +11:00
  • c4b45bdbbf Fix line items returning prices with fractional cents Rohan Mitchell 2014-12-18 15:28:02 +11:00
  • b0f5d0170c Spec that overridden price with fees appears in quick cart Rohan Mitchell 2014-12-18 13:32:28 +11:00
  • 5fcb2982fa Fees are calculated correctly for items with variant overrides Rohan Mitchell 2014-12-18 11:53:17 +11:00
  • ead84aa9ff Add ids to product listing products and variants Rohan Mitchell 2014-12-18 11:00:45 +11:00
  • 1d3800696e Variant overrides can override stock levels Rohan Mitchell 2014-12-18 10:40:56 +11:00
  • f5ee9ba2f3 VariantOverride looks up count_on_hand Rohan Mitchell 2014-12-18 10:21:07 +11:00
  • e6eecd3ae2 Replace proxies with modules Rohan Mitchell 2014-12-18 10:20:31 +11:00
  • 0832a8f63d Viewing products shows overridden prices Rohan Mitchell 2014-12-17 14:15:08 +11:00
  • 23c7715929 Cosmetic change Rohan Mitchell 2014-12-17 14:02:30 +11:00
  • 2ea7bdbec6 Move controller spec to serializer spec Rohan Mitchell 2014-12-17 14:01:59 +11:00
  • 6c300431d2 Move Product#variants_for to Variant.for_distribution scope Rohan Mitchell 2014-12-17 13:37:16 +11:00
  • 91c500417b Swap param order Rohan Mitchell 2014-12-12 14:34:55 +11:00
  • 7e49bd634e Updated the specs with Rohans suggestions Lynne Davis 2014-12-12 18:23:43 +00:00
  • eeae72352b Renamed methods and vars to better fit naming conventions Lynne Davis 2014-12-12 10:11:33 +00:00
  • 66669e66ab Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts Rob Harrington 2014-12-12 15:43:05 +11:00
  • 99dce6e8d6 Merge branch 'enterprise-form-confirmation' Rohan Mitchell 2014-12-12 15:29:59 +11:00
  • 27b0052e2b Merge branch 'product-category-required' Rohan Mitchell 2014-12-12 15:29:31 +11:00
  • 0b3dfa7278 Merge branch 'product-reports-without-deleted' Rohan Mitchell 2014-12-12 15:29:03 +11:00
  • 84b607433c Creating and then updating the new override updates the same override instead of creating a duplicate Rohan Mitchell 2014-12-12 12:06:55 +11:00
  • 31823f2dbd Setting both values to blank deletes override Rohan Mitchell 2014-12-12 11:44:35 +11:00
  • ca1c116a5d Swap param order Rohan Mitchell 2014-12-11 15:30:38 +11:00