Commit Graph

  • 3b9824171a Adding with_order_cycles_as_supplier_outer scope to Enterprise Rob Harrington 2015-04-02 15:53:32 +11:00
  • 5d7659aa3c Fixing product spec, using have_select2 instead of have_field Rob Harrington 2015-04-02 14:36:19 +11:00
  • 1e1d52cc47 Adding 'selected' option to have_select2 matcher Rob Harrington 2015-04-02 14:35:39 +11:00
  • 76648b97b0 Update spec, properties must exist for enterprise users before they can be assigned Rob Harrington 2015-04-02 14:15:00 +11:00
  • 5020eb4e32 And again: override redirect to index page when editing properties from edit page Rob Harrington 2015-04-02 14:14:16 +11:00
  • cb376602f2 Override redirect to index page when editing properties from edit page Rob Harrington 2015-04-02 14:03:51 +11:00
  • 3aa5f6e023 Adding properties tab to admin enterprise edit form Rob Harrington 2015-04-02 11:30:32 +11:00
  • 8926e3765e Replace free text with with select dropdown for product property names when not super admin Rob Harrington 2015-04-02 08:57:15 +11:00
  • 5b235f356e Replace free text with with select dropdown for property names when not super admin Rob Harrington 2015-04-02 08:56:36 +11:00
  • 8ed6653dc4 Ignoring any new product properties submitted by a non-admin user Rob Harrington 2015-04-02 08:55:20 +11:00
  • ca1a5b5f8d Ignoring any new producer properties submitted by the user Rob Harrington 2015-04-02 08:54:35 +11:00
  • 8d95ba2c69 Display full name of variant on order cycle edit form Rob Harrington 2015-04-01 15:46:19 +11:00
  • 94a88278a9 Ignore the unit_to_display when it is wholly contained within display_name or vice versa Rob Harrington 2015-04-01 15:46:11 +11:00
  • 588e036c1d Adding SKU to customer totals report Rob Harrington 2015-04-01 14:45:23 +11:00
  • aa7ddbcba4 Renaming Dist. column to Admin & Handling Rob Harrington 2015-04-01 14:38:15 +11:00
  • 54af6886c2 Line items with a quantity of zero return price_with_adjustments of 0.0 Rob Harrington 2015-04-01 12:34:22 +11:00
  • d49dd62124 Replace unused bugsnag notification with one to test for line items with a quantity of zero Rob Harrington 2015-04-01 11:38:06 +11:00
  • d4cf44a6dd Use COUNTRY_CODE instead of COUNTRY in application.yml. Paul Mackay 2015-03-29 17:06:05 +01:00
  • 6e77a5eebc Using the correct method name duh Rob Harrington 2015-03-27 16:47:12 +11:00
  • 2d5118290b Fixing broken order cycle feature specs Rob Harrington 2015-03-27 15:50:23 +11:00
  • 74b7feda53 coordinator of a simple order cycle has permission to add their own variants to outgoing exchanges Rob Harrington 2015-03-27 15:49:48 +11:00
  • f5bacf71b7 Permissions for OrderCycleFormApplicator are determined internally Rob Harrington 2015-03-27 15:48:44 +11:00
  • 3817ef202c Enterprises in simple OC create controller only load after OC initialises Rob Harrington 2015-03-27 15:47:27 +11:00
  • aa170ef5f6 Order cycle simple create controller uses 'new' method on OC service to initialise Rob Harrington 2015-03-27 11:29:02 +11:00
  • 4d14acb64d Don't send non-attributes of js order_cycle object to server Rob Harrington 2015-03-27 10:39:13 +11:00
  • 43d2eb4d22 Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs Rob Harrington 2015-03-27 10:32:06 +11:00
  • 887579ecb8 Use managed_by scope on Enterprise instead of user.enterprises Rob Harrington 2015-03-26 22:41:10 +11:00
  • 9430999540 Filtering exchange variants, for outgoing exchange variant count Rob Harrington 2015-03-26 22:38:53 +11:00
  • 193a061c44 Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to permissions Rob Harrington 2015-03-26 22:29:30 +11:00
  • 540ac845da Fixing broken js spec Rob Harrington 2015-03-26 22:26:48 +11:00
  • 5e015f0611 Rename visibleVariants filter to visibleProductVariants Rob Harrington 2015-03-26 22:24:37 +11:00
  • 681dada5df Simple OC form loads coordinator into JS Rob Harrington 2015-03-26 22:21:06 +11:00
  • 99bd6244ed Filtering the list of variants visible within each exchange based on permissions Rob Harrington 2015-03-25 15:38:08 +11:00
  • 63e345f819 Exchange serializer cuts down list of variants visible to the current user, based on permissions Rob Harrington 2015-03-25 11:58:07 +11:00
  • 524645aff4 Replacing visible_variants_for(exchange) with more general methods for determining visbility based on the enterprises involced and the current order cyclegs Rob Harrington 2015-03-25 11:29:35 +11:00
  • d115ef5f7e Scoping old generalised order cycle helper methods to a specific order cycle Rob Harrington 2015-03-25 10:46:32 +11:00
  • 35b27fcfd2 Delegating responsibility for returning an empty scope when no options are passed to order_cycle_enterprises_for Rob Harrington 2015-03-20 17:44:59 +11:00
  • b747f61eb1 P-OC permissions don't apply when determining which enterprises are loaded for order cycle interface Rob Harrington 2015-03-20 17:09:26 +11:00
  • 45f6042d3d Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator Rob Harrington 2015-03-20 16:33:08 +11:00
  • a1aa9512a8 Fixing angular order_cycle controller spec Rob Harrington 2015-03-20 15:26:19 +11:00
  • 7e24e6743e enterprises_for is now order_cycle_enterprises_for, and can be passed an order_cycle or a coordinator (for new order_cycles) Rob Harrington 2015-03-20 12:22:46 +11:00
  • c9f343f680 Swapping over scoping method for displayed enterprises in OC index page from order_cycle_enterprises to enterprises_for(order_cycle) Rob Harrington 2015-03-20 00:33:39 +11:00
  • d8c4e292c8 Adding method for determining variant override hubs Rob Harrington 2015-03-20 00:32:05 +11:00
  • 81765de7a7 Building a permission method to determine which enterprises are visible to the user for a given OC Rob Harrington 2015-03-19 23:46:38 +11:00
  • 4dff3fe79c Removing unused distributable action from products api Rob Harrington 2015-03-19 17:05:47 +11:00
  • 1927bc55d0 Load actual variants in the exchange, wrong behaviour was implemented in previous two commits Rob Harrington 2015-03-19 17:04:43 +11:00
  • e9f2e743ce Replacing old representative template for OCs with active model serializers Rob Harrington 2015-03-19 12:17:09 +11:00
  • 1c09b8b76f Limiting variants loaded into representative template to those a visible to the current user Rob Harrington 2015-03-19 11:35:38 +11:00
  • 00821a60cc More specific references to enterprise id in permissions querying methods Rob Harrington 2015-03-19 11:34:04 +11:00
  • 252ddf9beb Adding method to permissions library for scoping the list of visible variants in a given exchange to a particular user Rob Harrington 2015-03-19 11:23:44 +11:00
  • 22161bfd6e rewriting permissions query functions in permissions library, to make scoping easier Rob Harrington 2015-03-19 10:33:32 +11:00
  • 6c4db7fc22 Adding permission to view outgoing exchanges to producers who have granted P-OC to the relevant outgoing hub Rob Harrington 2015-03-18 17:50:12 +11:00
  • df4437ecfe Altering permissions for exchanges, so the exchange is visible to managers of at least one of the enterprises invloved Rob Harrington 2015-03-18 16:29:22 +11:00
  • 2310a6a7db Splitting out order cycle abilities from general order management abilities Rob Harrington 2015-03-13 15:30:24 +11:00
  • 85e4b3970c Adding an 'involved' scope to exchanges Rob Harrington 2015-03-13 14:29:55 +11:00
  • 75a37e16e3 Remove elements of order cycle form that coordinators cannot edit Rob Harrington 2015-03-13 14:29:21 +11:00
  • f8a9652333 Moving SASS comments to thier own lines Rob Harrington 2015-03-12 12:24:18 +11:00
  • 75ed259554 Conditionally show input for coordinator Rob Harrington 2015-02-27 10:22:05 +11:00
  • a9c7e4b716 Order cycles index shows all OrderCycles I am involved in Rob Harrington 2015-02-27 10:13:04 +11:00
  • 0b082c964b Restricting which enterprises can coordinate an order cycle Rob Harrington 2015-03-04 09:47:48 +11:00
  • 8037811735 Only make new enterprises as hubs when current user *owns*, not just manages a hub. Rohan Mitchell 2015-03-27 14:38:21 +11:00
  • 0ed1eeffd6 When registering a new enterprise, if user is signed in, owns a hub and is not making a producer, the new enterprise becomes a hub Rohan Mitchell 2015-03-27 14:05:58 +11:00
  • d471368412 Spacing Rohan Mitchell 2015-03-27 13:09:25 +11:00
  • 09a102bd8b When an enterprise user with a hub creates a new producer, it does not default to sells any #453 Rohan Mitchell 2015-03-27 11:53:13 +11:00
  • d8656a36c6 Consistency in tax calculations, remove some unneeded local vars Rohan Mitchell 2015-03-25 16:31:15 +11:00
  • 89d4a59e9d Extract order total tax calculations to model Rohan Mitchell 2015-03-25 16:14:46 +11:00
  • 84f3097217 Calculate total tax from the tax included in all the adjustments on the order Rohan Mitchell 2015-03-25 16:07:03 +11:00
  • 333a4ecf2f Include enterprise fee tax on sales tax report Rohan Mitchell 2015-03-25 15:30:36 +11:00
  • 40b4edeca1 Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies. Rohan Mitchell 2015-03-25 14:50:26 +11:00
  • 9650692699 Calculate total tax on enterprise fees for an order Rohan Mitchell 2015-03-25 14:27:42 +11:00
  • 69dc92dec1 Create factories zoned_order and taxed_product Rohan Mitchell 2015-03-24 11:53:18 +11:00
  • d489e06009 Retrieve line item sales tax from included_tax rather than tax amount Rohan Mitchell 2015-03-24 10:40:54 +11:00
  • daa30ed518 Retrieve the shipping tax on the order instead of calculating it from scratch Rohan Mitchell 2015-03-20 11:15:49 +11:00
  • 7fb8370c36 Look up shipping tax on an order Rohan Mitchell 2015-03-20 11:12:56 +11:00
  • e2a4b9a898 Fix specs that relied on the old login page which we now redirect to the new page Rohan Mitchell 2015-03-25 12:11:06 +11:00
  • 2a7a106ad8 Merge branch 'folklabs-currency-config' Rohan Mitchell 2015-03-25 11:54:06 +11:00
  • 1005a06583 Merge branch 'currency-config' of https://github.com/folklabs/openfoodnetwork into folklabs-currency-config Rohan Mitchell 2015-03-25 11:39:43 +11:00
  • c36272ead6 Switch to update_column, which will not run geocoding callback of Enterprise Rohan Mitchell 2015-03-25 11:37:10 +11:00
  • c6ddf36856 Make migration reversible Rohan Mitchell 2015-03-25 11:35:59 +11:00
  • ebb3688add Merge branch 'migrations' of https://github.com/folklabs/openfoodnetwork into folklabs-migrations Rohan Mitchell 2015-03-25 11:30:00 +11:00
  • 5da9bdc614 Merge branch 'victornava-legacy-login-fix' Rohan Mitchell 2015-03-25 10:37:14 +11:00
  • af9a7a2ed4 #443: Support currency configuration. Fix LOCALE variable name. Paul Mackay 2015-03-24 15:34:45 +00:00
  • fcfb1aeb87 #440: Try removing validation from update (to prevent geocoding). Paul Mackay 2015-03-23 14:24:16 +00:00
  • e39d2eb113 #440: Reset Enterprise columns before querying them. Paul Mackay 2015-03-23 13:47:44 +00:00
  • 7090bb518b Tweaking logic for alert bar to make messages more human readable for all use cases. summerscope 2015-03-20 14:24:59 +11:00
  • 0b1857771e Finally got this slide animation working. stupid angular documentation! summerscope 2015-03-20 13:09:45 +11:00
  • 938eff8482 More layout tweaks to enterprise modal template summerscope 2015-03-19 16:13:47 +11:00
  • b99e94cecf WIP on producer and product modals summerscope 2015-03-19 16:02:52 +11:00
  • 1f97052954 Add a min height to modals so they are not quite so stupidly small when not enough content suppied by users summerscope 2015-03-19 15:05:14 +11:00
  • c76aa1d1c2 WIP on product modal summerscope 2015-03-19 14:52:09 +11:00
  • cdd41ad651 change animation class summerscope 2015-03-19 14:52:00 +11:00
  • 3c61bf9cc4 Styling for no image available on product modal overlay summerscope 2015-03-19 14:51:41 +11:00
  • 8a0bbb374c Animation WIP summerscope 2015-03-19 14:51:23 +11:00
  • 4e54a3c48e Updating no image all grey, large version larger summerscope 2015-03-19 14:50:50 +11:00
  • ab9bc7b1dc Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action 0.7.4 Rohan Mitchell 2015-03-18 12:50:25 +11:00
  • bfe7f49033 Show and hide search box Rob Harrington 2015-03-18 12:01:53 +11:00
  • cf4ccc268a Admin may set no tax category on product unless tax category is required Rohan Mitchell 2015-03-18 10:12:32 +11:00
  • 7af17242f9 EnterpriseFee admin interface allows selecting no fee Rohan Mitchell 2015-03-16 14:05:04 +11:00
  • eb5e411a8e Update zeus Rohan Mitchell 2015-03-16 14:00:55 +11:00
  • a6f0d8f69a Show a nice error message instead of 500 error when deleting a referenced order cycle Rohan Mitchell 2015-03-16 12:42:35 +11:00