Commit Graph

  • ee8a86d495 User model can generate a current invoice for enterprise users Rob Harrington 2015-06-30 16:41:02 +08:00
  • fa8c3d65dc Adding settings for global accounts and billing setup Rob Harrington 2015-06-30 14:09:20 +08:00
  • b4e58a1a79 WIP: Basic structure for daily job to update user invoices Rob Harrington 2015-06-29 13:07:51 +08:00
  • 550434dfe8 Renaming bill_items to billable_periods Rob Harrington 2015-06-26 17:42:46 +08:00
  • fc44e57171 Finishing refactor of bill item updater spec Rob Harrington 2015-06-26 15:59:49 +08:00
  • 77f735c722 WIP: Refactoring bill item updater specs Rob Harrington 2015-06-26 15:42:18 +08:00
  • b736e209ca Bill Item Update handles enterprises created part-way through the month Rob Harrington 2015-06-25 17:36:57 +08:00
  • af2bc99c71 Clean up update_bill_items spec after refactor Rob Harrington 2015-06-25 16:19:45 +08:00
  • 924b3b4cc3 Refactoring update_bill_items job Rob Harrington 2015-06-25 16:17:29 +08:00
  • b724745acc WIP: First take at a nightly job for calculating turnover for enterprises Rob Harrington 2015-06-25 15:28:29 +08:00
  • bbe25da117 Adding paper_trail verisoning RSpec helpers Rob Harrington 2015-06-25 15:26:30 +08:00
  • 77e361dd52 Adding shop_trial_expiry method to enterpise model Rob Harrington 2015-06-25 15:26:04 +08:00
  • 083d7327bc Adding BillItem to database Rob Harrington 2015-06-25 15:25:15 +08:00
  • 2fa217df56 Adding paper_trail to enterprise model, to track changes to owner_id and sells Rob Harrington 2015-06-19 17:41:02 +08:00
  • 6489848eff Adding paper_trail gem Rob Harrington 2015-06-19 17:40:50 +08:00
  • b8e40d799b Added translations sigmundpetersen 2015-09-17 14:18:09 +02:00
  • 205a7f1673 Auto-merge from CI [skip ci] Continuous Integration 2015-09-17 09:16:20 +10:00
  • 2e591b98e1 remove unused javascript Maikel Linke 2015-09-02 15:00:14 +10:00
  • 0b4a43d77a Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views Maikel Linke 2015-09-16 16:32:16 +10:00
  • ce87ea54cd Merge branch 'i18n-replace-strings-in-views' of github.com:openfoodfoundation/openfoodnetwork into i18n-replace-strings-in-views Maikel Linke 2015-09-16 16:24:38 +10:00
  • 637e5c4fee PermalinkGenerator for products Maikel Linke 2015-09-09 11:43:30 +10:00
  • ecca23488d Merge branch 'ci-handling-git-tags' into combined/deadlock-js-spec_ci-git-tags_product-permalinks Maikel Linke 2015-09-16 15:43:13 +10:00
  • 2488411b94 JS feature specs completing before cleaning db Maikel Linke 2015-09-16 14:24:01 +10:00
  • 3f822ed0e3 trying to get rid of intermittent failures Maikel Linke 2015-09-16 13:06:32 +10:00
  • 33af6cbfb1 Specs pending for lagging JS spec test v1.2.1 Maikel Linke 2015-09-16 11:24:44 +10:00
  • 326c972f63 Handling nil in final_weight_volume calculation Maikel Linke 2015-09-16 10:12:59 +10:00
  • 11892ffe21 creation of the french translation file Myriam 2015-09-14 14:42:37 +02:00
  • 10cd654ff5 CI Handling git tags Maikel Linke 2015-09-11 15:41:44 +10:00
  • 51064f31a3 Merge remote-tracking branch 'origin/master' into uk-variable-weights-improvements v1.2 Maikel Linke 2015-09-10 16:05:28 +10:00
  • e25805aa78 Restoring all changes of the last combined branch Maikel Linke 2015-09-10 15:03:13 +10:00
  • 1e55e8a907 Reverting all changes of the last combined branch Maikel Linke 2015-09-10 12:50:40 +10:00
  • 47d239ee3a fix for intermittent capybara click failure Maikel Linke 2015-09-09 17:08:42 +10:00
  • 2e2e767564 always displaying group_buy_unit_size Maikel Linke 2015-09-09 12:22:28 +10:00
  • 3e53decd85 Delete fr.yml Myriam 2015-09-04 15:25:53 +02:00
  • 4f0e75893e Create fr.yml Myriam 2015-09-04 15:22:19 +02:00
  • f0709d5e46 Merge branch 'show-only-visible-shops' into combined/shopfront_group-buy_customer-contact Maikel Linke 2015-09-04 21:49:12 +10:00
  • e8ce9feb52 Merge branch 'customers-link' into combined/shopfront_group-buy_customer-contact Maikel Linke 2015-09-04 21:48:58 +10:00
  • a3074fa51e Merge branch 'customer-contact-in-order-email' into combined/shopfront_group-buy_customer-contact Maikel Linke 2015-09-04 21:47:35 +10:00
  • c1cbf9a35c Merge branch 'group-by-unit-size-display' into combined/shopfront_group-buy_customer-contact Maikel Linke 2015-09-04 21:47:22 +10:00
  • 8dffb772dc Merge branch 'shopfron-validation' into combined/shopfront_group-buy_customer-contact Maikel Linke 2015-09-04 21:47:08 +10:00
  • 60b2596774 disable max quantity unless min quantity is set Maikel Linke 2015-09-04 16:56:51 +10:00
  • 6a2af09006 rounding decimal quantities in shopfront Maikel Linke 2015-09-04 16:15:02 +10:00
  • d9b1215a01 Update clicking checkout in spec Maikel Linke 2015-09-04 10:54:50 +10:00
  • e61abb92d2 Create no.yml sigmundpetersen 2015-09-03 12:16:58 +02:00
  • 0895bd8647 Non-integer values cannot be entered into shop front quantities Maikel Linke 2015-09-03 17:42:26 +10:00
  • 2e3ff8f5c6 doubling cart buttons Maikel Linke 2015-09-03 15:52:54 +10:00
  • 93f6667c4b Update products group by spec Maikel Linke 2015-09-03 15:01:28 +10:00
  • 23355d1a25 include order email and phone number in email for shop Maikel Linke 2015-09-03 14:46:08 +10:00
  • 0fdd000589 Showing Bulk Unit Size in BulkCoopReport Maikel Linke 2015-09-03 12:26:40 +10:00
  • 57caeb64c5 Remove unused product form partial Maikel Linke 2015-09-03 12:24:57 +10:00
  • 832f47d6b0 fix i18n typo Maikel Linke 2015-09-02 16:58:04 +10:00
  • d3e66bcfa5 Auto-merge from CI [skip ci] Continuous Integration 2015-09-02 14:44:05 +10:00
  • 415dac3ae3 Updating spec for new Login label Maikel Linke 2015-08-28 21:12:56 +10:00
  • 8b6f5b4a99 Updating spec for new Login label Maikel Linke 2015-08-28 18:36:23 +10:00
  • 06010bd8ad Auto-merge from CI [skip ci] Continuous Integration 2015-08-28 17:04:53 +10:00
  • 85c99102dd i18n: Replacing all language strings in app/view/ Maikel Linke 2015-08-27 16:54:20 +10:00
  • 1a96ef88bc Hiding invisible hubs in producer modal Maikel Linke 2015-08-28 10:49:36 +10:00
  • d682a29a65 Admin menu contains link to /admin/customers Maikel Linke 2015-08-28 10:31:53 +10:00
  • ced254919a Updating JS spec Maikel Linke 2015-08-27 13:51:19 +10:00
  • 64834dd50a Fixing display of cloned products Maikel Linke 2015-08-27 11:55:31 +10:00
  • 5d34b711e9 Handling undefined customer tags Maikel Linke 2015-08-26 15:01:20 +10:00
  • 4f7f2e2035 Displaying customer tags Maikel Linke 2015-08-21 16:42:36 +10:00
  • d595e1558a Auto-merge from CI [skip ci] Continuous Integration 2015-08-26 10:03:13 +10:00
  • 5ccae9cfab Redirecting /products/:id to / Maikel Linke 2015-08-21 15:18:31 +10:00
  • adc20e9e4e Handling tax categories without tax rates Maikel Linke 2015-08-21 15:16:00 +10:00
  • 03627e2ef2 Auto-merge from CI [skip ci] Continuous Integration 2015-08-21 13:41:02 +10:00
  • 3e5028b6b9 Revise lettuceshare report - combine grower and cert cols, add column headings Rohan Mitchell 2015-08-16 11:06:52 +08:00
  • e843beaf18 Remove enterprise address from order confirmation and mailer, since in these contexts the pickup location will be specified elsewhere. #636 Rohan Mitchell 2015-08-07 14:19:48 +10:00
  • 170799f65f Add permission for hub enterprise users to use xero report #628 Rohan Mitchell 2015-08-07 13:36:50 +10:00
  • 9e1788a6b0 Apply migrations to db/schema.rb Rohan Mitchell 2015-08-07 12:03:43 +10:00
  • 719ddea789 Merge branch 'variable-weights-improvements' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-variable-weights-improvements Rohan Mitchell 2015-08-07 11:10:07 +10:00
  • 3eea002a0c Put rspec-retry on flaky specs Rohan Mitchell 2015-08-07 11:06:16 +10:00
  • 6f4dc6943e Add first cut of LettuceShare report Rohan Mitchell 2015-08-05 16:58:54 +10:00
  • e75b595b97 Tidy syntax Rohan Mitchell 2015-08-05 14:02:41 +10:00
  • af04c61528 Add rspec-retry for intermittently failing spec Rohan Mitchell 2015-08-05 13:35:38 +10:00
  • 14900655df Auto-merge from CI [skip ci] Continuous Integration 2015-08-05 12:18:31 +10:00
  • be66769999 SELECT DISTINCT results in inconsistent #count value. Work around this with to_a. Rohan Mitchell 2015-08-05 11:05:29 +10:00
  • 8639109372 Variable weights improvements additions Lynne Davis 2015-08-04 20:13:28 +01:00
  • eca25a2564 Make coordinator fees apply to all variants, not just those with exchange fees Rohan Mitchell 2015-07-31 16:55:43 +10:00
  • 012b0517a5 Fetch order cycle variants in SQL Rohan Mitchell 2015-07-31 16:48:29 +10:00
  • faa1d0d1c5 When cart clear is declined, revert order cycle selection change Rohan Mitchell 2015-07-31 11:35:29 +10:00
  • b97bbae00e Remove old selenium-related test helper, remove unused param on handle_js_confirm Rohan Mitchell 2015-07-31 11:33:43 +10:00
  • 679531fe2a Prompt for clear cart when order cycle changes Rohan Mitchell 2015-07-30 15:04:43 +10:00
  • eb6dcba396 Clear localstorage in Cart.clear() Rohan Mitchell 2015-07-30 10:55:17 +10:00
  • 9c9051498b Rename ofnEmptiesCart to ofnChangeHub Rohan Mitchell 2015-07-30 10:06:57 +10:00
  • 5688cfd1dd WIP: Rename ofnEmptiesCart to ofnChangeHub Rohan Mitchell 2015-07-30 10:06:09 +10:00
  • fc409c97bf Decouple ofn-empties-cart directive from hub-choice navigation Rohan Mitchell 2015-07-29 16:14:46 +10:00
  • 09b4b3e659 When order cycle is changed, clear the cart Rohan Mitchell 2015-07-29 14:36:52 +10:00
  • bf2bd403a4 Clear variants when order cycle changed, not when products are initially loaded Rohan Mitchell 2015-07-28 16:53:33 +10:00
  • 012a210782 Add method to clear cart Rohan Mitchell 2015-07-28 14:37:25 +10:00
  • 7caebb11e2 Clear variants registry before reloading products - fixes fees not updating when changing order cycle Rohan Mitchell 2015-07-28 12:00:40 +10:00
  • ee65452de3 Add method to clear variants registry Rohan Mitchell 2015-07-28 11:57:12 +10:00
  • 3a9b13b55e Reorder methods Rohan Mitchell 2015-07-28 11:56:08 +10:00
  • 734b2fc766 Merge branch 'master' into redesign-cms Rohan Mitchell 2015-07-31 14:59:33 +10:00
  • 5559231245 Fix date spec error Rohan Mitchell 2015-07-31 14:59:05 +10:00
  • 3345f54e0a Merge branch 'master' into redesign-cms Rohan Mitchell 2015-07-31 14:55:01 +10:00
  • ec908fce92 Make TOS URL configurable Rohan Mitchell 2015-07-31 14:51:17 +10:00
  • d8f4061030 Tidy link Rohan Mitchell 2015-07-30 12:09:20 +10:00
  • 759c53ec34 Add note about provisioning to README Rohan Mitchell 2015-07-30 11:45:38 +10:00
  • 8d041f5e7a Auto-merge from CI [skip ci] Continuous Integration 2015-07-29 12:03:03 +10:00