Commit Graph

  • 38b0a581e0 New landing page - initial layout and functionality alexs 2013-08-05 17:04:56 +10:00
  • a2b612e723 Add clone and destroy product access for enterprise users David Cook 2013-08-05 15:21:20 +10:00
  • c40d694a15 Output correct task name David Cook 2013-08-05 15:20:35 +10:00
  • b0d9596489 Fix bug with available on translation - seemed to be getting overridden. Andrew Spinks 2013-08-05 10:00:47 +10:00
  • e75021d7bd Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way. Andrew Spinks 2013-08-02 18:13:42 +10:00
  • 9d32a5775a Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products. Andrew Spinks 2013-08-02 16:08:10 +10:00
  • 269294612d Add product tests for an enterprise user. Andrew Spinks 2013-08-02 14:01:45 +10:00
  • 0bb4f676e1 Add permissions to enterprise users so they can manage their own products. Andrew Spinks 2013-08-02 11:41:16 +10:00
  • 5bccd38b5e Fix tests - don't have feature toggle overrides on when running tests! Andrew Spinks 2013-08-01 15:37:42 +10:00
  • 46474ea4cc Prevent order cycle validations on orders when feature toggled off. Andrew Spinks 2013-08-01 15:01:47 +10:00
  • 287bd57a4e Fix loading of initial data to ensure there is an itemwise shipping method. Andrew Spinks 2013-08-01 10:31:17 +10:00
  • 65617e0e77 Add enterprise roles for a user and wire up interface. Andrew Spinks 2013-08-01 10:16:20 +10:00
  • 4f5679aac3 Add EnterpriseRole model and link up to users and enterprises. Andrew Spinks 2013-07-31 16:00:28 +10:00
  • 5810503068 Move test data seeding into separate rake task. Add new role to seeds file. Andrew Spinks 2013-07-26 11:47:25 +10:00
  • c64944d11a Fix test Rohan Mitchell 2013-07-30 17:32:53 +10:00
  • 4a893fd548 Style Rohan Mitchell 2013-07-30 13:49:38 +10:00
  • 4a0e35deef Clear coordinator fees when coordinator changes Rohan Mitchell 2013-07-30 13:46:30 +10:00
  • d64bcf0e94 Remove coordinator fees Rohan Mitchell 2013-07-30 11:55:21 +10:00
  • 24b957dc57 Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees. Rohan Mitchell 2013-07-30 11:33:40 +10:00
  • dc7f8986a0 Click to add coordinator fee Rohan Mitchell 2013-07-30 10:29:52 +10:00
  • ae0f82b479 Display only coordinator fees belonging to the selected coordinator Rohan Mitchell 2013-07-30 10:19:38 +10:00
  • 43474d6408 Display coordinator fees on admin edit order cycle Rohan Mitchell 2013-07-30 09:26:50 +10:00
  • 13a1809d6c Load enterprise fees in controllers Rohan Mitchell 2013-07-29 17:33:05 +10:00
  • 93e7ac53ad Add EnterpriseFee service for order cycles admin Rohan Mitchell 2013-07-29 17:27:11 +10:00
  • f613da30d0 Output order cycle coordinator fees in JSON Rohan Mitchell 2013-07-29 17:05:10 +10:00
  • a19a43da79 Add blank enterprise fees in js rather than in controller Rohan Mitchell 2013-07-29 17:03:00 +10:00
  • 122b9b5617 Make order cycle coordinator fees many-to-many Rohan Mitchell 2013-07-29 13:20:35 +10:00
  • bb9368a1b2 Listed dependecy on PhantomJS. alexs 2013-07-29 18:20:34 +10:00
  • d107786614 Make sure the payment details are shown prominently in the checkout screen. Andrew Spinks 2013-07-29 11:50:09 +10:00
  • dcc23078ff Merge branch 'master' of github.com:eaterprises/openfoodweb Rohan Mitchell 2013-07-29 11:52:06 +10:00
  • 36a124c10e Fix merge issues: DCV name change and application controller var name issues. Rohan Mitchell 2013-07-29 11:49:43 +10:00
  • 285353fb9a Updated copyright info. alexs 2013-07-29 11:13:48 +10:00
  • 7640eb497a Merge branch 'supplied-active-products-on-hand' Rohan Mitchell 2013-07-29 11:05:42 +10:00
  • 863236b827 Remove speculative test Rohan Mitchell 2013-07-29 09:47:28 +10:00
  • 6265dfc80d remove block commented code David Cook 2013-07-29 09:29:23 +10:00
  • 5adab948c9 Re-instate old order checkout behaviour. Andrew Spinks 2013-07-26 14:30:54 +10:00
  • 1797933501 Remove xvfb from travis deploy. Should no longer be required. Andrew Spinks 2013-07-25 14:13:06 +10:00
  • 6c18c5c65f Fix bulk product edit so that it works with products with a blank available_on field. Andrew Spinks 2013-07-25 13:51:37 +10:00
  • 39536b2a13 And another dependency getting lost. Andrew Spinks 2013-07-24 17:52:15 +10:00
  • 54a79bc6ab Fix other dependency injection problems in bpe angular code after magnification. Andrew Spinks 2013-07-24 17:47:48 +10:00
  • 24414036b9 Attempt to fix bulk product angular dependency injection which breaks on minification. Andrew Spinks 2013-07-23 18:16:27 +10:00
  • fadb1e4710 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-07-23 18:02:28 +10:00
  • 37a88a1be6 Changed JavaScript driver from selenium to phantomjs. alexs 2013-07-23 17:54:05 +10:00
  • 1d5e970b47 Fix test regressions with multiple 'Save and Continue' buttons in checkout Rohan Mitchell 2013-07-23 17:48:54 +10:00
  • dd97768947 Merge branch 'move-save-checkout-button' Rohan Mitchell 2013-07-23 17:03:00 +10:00
  • 638d7b1c33 Stylistic changes, extract commented code to private method Rohan Mitchell 2013-07-23 17:02:06 +10:00
  • 2f83cecc23 Merge branch 'add-capture-order-shortcut-deface' Rohan Mitchell 2013-07-23 16:55:33 +10:00
  • d83e8cb3ba Remove commented out code, clean up comments and style Rohan Mitchell 2013-07-23 16:51:22 +10:00
  • 1dd92d0133 Move deface to a partial Rohan Mitchell 2013-07-23 16:50:42 +10:00
  • 1add182757 Feature toggle order cycles. Andrew Spinks 2013-07-23 15:57:43 +10:00
  • 8e560a59c9 Fix selection of itemwise shipping method that broke after the spree upgrade. Andrew Spinks 2013-07-23 15:46:07 +10:00
  • 7cb054f430 Merge branch 'master' into order-cycle-selection Andrew Spinks 2013-07-23 14:42:57 +10:00
  • f580b43619 Merge remote-tracking branch 'origin/master' Rohan Mitchell 2013-07-23 14:03:08 +10:00
  • b73c584c3b Update order confirmation email in line with changes in spree Rohan Mitchell 2013-07-23 14:00:29 +10:00
  • 3315191b81 Fix intermittent admin-user-has-no-admin-role error in specs Rohan Mitchell 2013-07-23 14:00:07 +10:00
  • 7532ebee5a Require feature toggle within engines needs require_relative Rohan Mitchell 2013-07-23 13:59:39 +10:00
  • 418393afbd Updated requirements documentation. alexs 2013-07-23 13:53:00 +10:00
  • fe61cddda6 Merge branch 'local-organics' Rohan Mitchell 2013-07-23 11:40:03 +10:00
  • 86616c4a6c Add sass gem explicitly Rohan Mitchell 2013-07-23 10:36:32 +10:00
  • de78d09790 New branch for spree_last_address to fix compatibility issue with spree_auth_devise 1.3 Rob H 2013-07-12 01:24:36 +05:30
  • 0322f21e5c Rearrange bpe action buttons Rob H 2013-07-12 01:07:18 +05:30
  • 275b64c7d3 Fix broken delete action for variants Rob H 2013-07-12 00:57:33 +05:30
  • ba04d0ea74 Increase wait time for delete action in bpe specs Rob H 2013-07-11 23:47:38 +05:30
  • 4c435e118a BPE action buttons in separate columns Rob H 2013-07-11 23:45:36 +05:30
  • 3c973178fd WIP: remove unneeded representative-based data request infrastructure Rob H 2013-07-11 23:39:41 +05:30
  • 961d63ec4c WIP: Fix references in js tests for bpe Rob H 2013-07-11 23:21:55 +05:30
  • 9863a84a27 WIP: transfer bulk product update data requests to API Rob H 2013-07-11 20:07:06 +05:30
  • 97c03b50cc Create new api routes/views/controllers for bulk product edit Rob H 2013-07-10 11:06:42 +05:30
  • 8f6ec9bd9b WIP (Spree Update): Fix frontend order payment summary Rob H 2013-07-10 08:20:21 +05:30
  • 45309d6a75 WIP (Spree Update): Remove unrequired reference to AnalyticsHelper Rob H 2013-07-02 23:08:10 +05:30
  • 703f51ac1b WIP (Spree Update): Update reference to current_user -> spree_current_user Rob H 2013-07-02 22:47:30 +05:30
  • 1f152d8121 WIP (Spree Update): Update authentication workflow input names Rob H 2013-07-02 22:46:40 +05:30
  • 78263f6835 WIP (Spree Update): change formats of tab overrides Rob H 2013-06-29 21:50:56 +05:30
  • 56f507dc03 WIP (Spree Update): Bump spree_auth_devise to resolve issue with admin 'Configuration' tab Rob H 2013-06-29 21:47:37 +05:30
  • f055ece503 WIP (Spree Update): update variables.css.scss Rob H 2013-06-29 21:28:03 +05:30
  • 7941a61879 WIP (Spree Update): Update Spree 1.3.3, install and run migrations Rob H 2013-06-29 18:02:57 +05:30
  • 108dd6e619 Update Rails to 3.2.13 from 3.2.11 Rob H 2013-06-29 17:12:10 +05:30
  • 19fbbb8374 BPUR: match product supplier on clone Rob H 2013-06-26 22:42:59 +05:30
  • c826b18584 Wait for variants and products to be deleted Rob H 2013-06-26 19:07:13 +05:30
  • f169dcda88 BPUR: Fix final unstable tests, js concurrency etc. Rob H 2013-06-26 16:45:50 +05:30
  • ba840124d2 Install rabl and oj Rob H 2013-06-22 23:43:02 +05:30
  • 2384c4a43e Remove naughty pry Rob H 2013-06-22 23:41:05 +05:30
  • 126f11683d BPUR: Add datetimepicker to Available On Rob H 2013-06-22 13:13:24 +05:30
  • 23a56ff4f1 BPUR: toggle visbility of columns Rob H 2013-06-21 15:36:25 +05:30
  • f750251cb8 BPUR: Visually differentiate products and variants in table Rob H 2013-06-21 09:37:05 +05:30
  • 5d30df5717 BPUR: add supplier name to product model to allow searching Rob H 2013-06-21 07:30:44 +05:30
  • f9832d1375 BPUR: Remove unnecessary setValidity method in ngDecimal Rob H 2013-06-20 22:47:19 +05:30
  • 4ae5085192 BPUR: Remove unnecessary collections of products on bulk edit page Rob H 2013-06-20 22:40:29 +05:30
  • 0ddd9cc6d0 BPUR: use where rather than select for product collection Rob H 2013-06-17 20:36:34 +05:30
  • 9beb560b72 BPUR: cancel any pre-existing timeouts on message models when new message set Rob H 2013-06-17 19:07:07 +05:30
  • b775145b16 BPUR: Add ability to filter by search and toggle variants Rob H 2013-06-17 12:46:03 +05:30
  • 57f2eff1b0 BPUR: Add warnings before deleting products/variants or directing to edit page Rob H 2013-06-16 18:20:32 +05:30
  • ef435dc6da Typo Rob H 2013-06-16 15:58:05 +05:30
  • 8453b43c25 BPUR: Allow updating of delegated variant properties Rob H 2013-06-16 15:52:34 +05:30
  • 1bd4875a6f BPUR: Can clone products Rob H 2013-06-12 14:58:08 +05:30
  • 89e684a328 BPUR: add js tests for deleting products and variants Rob H 2013-06-09 22:14:42 +05:30
  • e8f24dc2dd BPUR: Add edit link for products and variants Rob H 2013-06-09 21:43:02 +05:30
  • febb9a44a2 Remove commented (unrequired) lines on code Rob H 2013-06-08 20:04:25 +05:30
  • c503c1b10c BPUR: refactor of filterSubmitProducts Rob H 2013-06-08 20:02:25 +05:30
  • dcf6446450 BPUR: can delete variants Rob H 2013-06-08 19:52:51 +05:30