Commit Graph

  • 5e081ce3ee Translations of validation messages in app/models Emmanuel 2015-12-15 22:40:21 +01:00
  • 2a4f3f9ae4 making test pass elf Pavlik 2015-12-21 06:52:30 +01:00
  • ed48b691e1 translations in app/assets/javascripts/admin knopfler81 2015-12-14 20:20:01 +01:00
  • 30141bd488 few translations in app/assets/javascripts/admin/ Emmanuel 2015-12-14 20:18:45 +01:00
  • e16e3fba40 translations in app/assets/javascripts/admin/ victor goutay 2015-12-14 20:30:50 +01:00
  • 69ab113201 translations in app/assets/javascripts/admin/ ludivinecp 2015-12-14 19:49:45 +01:00
  • 7192f12a49 first js translation for admin interface Florian Vallen 2015-12-13 18:18:33 +01:00
  • ec6962ea2c Implements i18n translation for admin interface Florian Vallen 2015-12-13 18:18:09 +01:00
  • 8a390dd237 fixing test failing after i18n changes elf Pavlik 2015-12-19 11:05:04 +01:00
  • 5290d0be6b add translation in /cache/code/ofn/openfoodnetwork/app/views/spree/admin julienFR88 2015-12-16 19:37:43 +01:00
  • 6cd7fbb455 all string translated in admin bulk orders management Edem 2015-12-17 13:53:06 +01:00
  • 8ccf527e01 all strings in app/views/spree/admin/overview/* translated! Edem 2015-12-16 19:00:25 +01:00
  • d2ec4fcf88 Everything string translated in admin/entreprise_relationships Edem 2015-12-13 17:06:49 +01:00
  • 8fa293f561 my admin interface translations julienFR88 2015-12-12 17:25:28 +01:00
  • b58306aad8 my first translations apprenti 2015-12-12 17:00:41 +01:00
  • 2a2f8f3531 admin entreprise_group are translated! Edem 2015-12-12 16:58:42 +01:00
  • 16ab8f04c3 Angularise /account page: Order service/controller, rough layout stveep 2015-12-18 17:06:04 +00:00
  • 61a58bca7d Travis can trigger the Github deploy API v1.3.0 Maikel Linke 2015-12-17 17:22:05 +11:00
  • e67e22ee73 Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security Rob Harrington 2015-12-17 14:22:16 +11:00
  • 7a23f671a2 Restricting access to orders within Sales Tax Report Rob Harrington 2015-11-19 14:58:13 +11:00
  • d115eb816e Restricting access to orders within Xero Invoices Report Rob Harrington 2015-11-19 14:54:19 +11:00
  • 4b5e33d5b0 Implementing new permissions for producers in reports_controller_spec Rob Harrington 2015-10-30 15:57:18 +11:00
  • c579d302d5 Fixing customer info security for orders and distributors report Rob Harrington 2015-10-29 16:48:16 +11:00
  • 2f2ebf419c Fixing customer info security for packing reports Rob Harrington 2015-10-29 16:47:56 +11:00
  • 2f13ab6adf Fixing customer info security for orders and fulfillments report Rob Harrington 2015-10-29 16:47:08 +11:00
  • b121984e76 Fixing customer info security for bulk coop report Rob Harrington 2015-10-29 16:46:39 +11:00
  • 23b9dd5c71 Auto-merge from CI [skip ci] Continuous Integration 2015-12-17 13:02:37 +11:00
  • bc6110c178 Re-defining in_distributor scope as method to allow chaining Maikel Linke 2015-12-17 12:42:28 +11:00
  • 72f7e545dc Making sure bill > 0 for finalize account invoice spec Rob Harrington 2015-12-17 12:04:24 +11:00
  • e0da49e4df Formatting dates for account invoices in rails time zone Rob Harrington 2015-12-17 11:34:06 +11:00
  • b004060679 Printing invoices doesn't fail when order has no order cycle Rob Harrington 2015-12-17 11:33:18 +11:00
  • ea68619f0b Use bundled rails to prepare imported database Maikel Linke 2015-12-17 10:31:31 +11:00
  • 555f639026 Fixing unstable update_account_invoice specs Rob Harrington 2015-12-17 09:16:19 +11:00
  • 26a2f1a280 Adjustments on account invoices are created based on presence of a bill Rob Harrington 2015-12-16 23:10:47 +11:00
  • 83e3fb98f7 Only display billable period adjustments where the amount in > 0 Rob Harrington 2015-12-11 13:15:24 +11:00
  • bac4fcbd8f Make sure that adjustments for billable periods have a valid order to attach to when creating/updating Rob Harrington 2015-12-10 16:39:48 +11:00
  • ecd11702c3 Fixing up enterprise user account page Rob Harrington 2015-12-10 12:31:05 +11:00
  • fe0652e243 When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value Rob Harrington 2015-12-09 14:19:57 +11:00
  • f49722ba90 Fixing broken BMC specs Rob Harrington 2015-11-19 15:01:49 +11:00
  • 0370723edd Attempt to add a sensible name and contact number to Account Invoice addresses Rob Harrington 2015-11-19 12:21:39 +11:00
  • d46712de84 Obsolete BillablePeriods only deleted if their associated order is not already complete Rob Harrington 2015-11-19 11:27:20 +11:00
  • 199a3c38f9 Bill is capped before tax is applied, like we say it is Rob Harrington 2015-11-19 10:45:36 +11:00
  • 0ed8cf973d Adding an example bill calculator to business model config edit page Rob Harrington 2015-11-19 08:37:51 +11:00
  • 76d4f74f6b Ammending BillablePeriod spec to be ensure tax is charged correctly Rob Harrington 2015-11-19 08:25:22 +11:00
  • ca3c464fda Reorganising busines model config settings, moving account invoice tax rate in busines model config settings Rob Harrington 2015-11-18 18:07:24 +11:00
  • 85f61364f8 BillablePeriods use global config to calculate bills Rob Harrington 2015-10-28 12:15:53 +11:00
  • c1d04af5cc Implementing monthly billing description logic in required pages Rob Harrington 2015-10-28 11:40:01 +11:00
  • 5b72f53738 Adding helper for describing monthly billing charges Rob Harrington 2015-10-28 11:39:01 +11:00
  • da325780b1 Adding BMC link to configurations menu Rob Harrington 2015-10-15 15:13:17 +11:00
  • a40a03905f Reorganising BMC edit view Rob Harrington 2015-10-15 14:14:21 +11:00
  • 044e423543 Adding update logic to business model config controller Rob Harrington 2015-10-15 13:50:14 +11:00
  • cb9b61f393 WIP: Adding an edit view for BMC variables Rob Harrington 2015-10-15 10:58:44 +11:00
  • 58031408f1 Adding basic business model configuration variables to app config Rob Harrington 2015-10-15 10:57:52 +11:00
  • e20b06bb97 Adding basic route and controller for business model configuration Rob Harrington 2015-10-14 10:30:22 +11:00
  • cc4f9dd09b Making lettuceshare report spec more robust Rob Harrington 2015-12-16 18:14:19 +11:00
  • 18ea0c1717 Pulling VariantOverride scoping down into products and inventory report base Rob Harrington 2015-12-16 14:23:43 +11:00
  • 2bb85eb8e0 Revert "Add SKU to LettuceShare report" Rob Harrington 2015-12-16 13:42:58 +11:00
  • 5d28a7fdf8 Adding SKU to Products and Inventory reports (except lettuceshare) Rob Harrington 2015-12-16 13:37:19 +11:00
  • befc558224 Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name Rob Harrington 2015-12-09 15:14:00 +11:00
  • c91f1301f0 Adding preferences to enterprises for sorting of order cycles in shopfront list Rob Harrington 2015-12-11 22:59:05 +11:00
  • e6a51bb49d Adding actions dropdown to admin order view/pages Rob Harrington 2015-12-11 22:20:59 +11:00
  • ae0ad73b4a Printable Invoices Improvements for Food Connect Rob Harrington 2015-12-11 09:07:13 +11:00
  • b7edf5e046 Auto-merge from CI [skip ci] Continuous Integration 2015-12-16 10:58:03 +11:00
  • 81f244025f Update due_date in feature test Em-AK 2015-12-13 18:26:28 +01:00
  • fcc328f00a Display default xero invoice dates Em-AK 2015-12-13 16:42:32 +01:00
  • 758b1f8e64 using in_stock? to filter variants in lettuceshare report Maikel Linke 2015-12-11 14:37:47 +11:00
  • bb58473b90 Consider variant overrides in LettuceShare report Maikel Linke 2015-12-11 13:03:15 +11:00
  • 1d46c2febd LettuceShare report: display only if count_on_hand > 0 Maikel Linke 2015-12-10 17:39:35 +11:00
  • 15ea64b409 Add SKU to LettuceShare report Maikel Linke 2015-12-10 13:44:00 +11:00
  • 6787709693 LettuceShare report: total in unit value column and total blank Maikel Linke 2015-12-10 11:57:37 +11:00
  • a3874d42af Spec moved to OpenFoodNetwork::LastUsedAddress Rohan Mitchell 2015-12-11 13:25:40 +11:00
  • 3f8d470d23 When admin associates user with an order, look up last used address Rohan Mitchell 2015-12-11 12:39:08 +11:00
  • ae3061df80 All orders specs use JS Rohan Mitchell 2015-12-11 12:38:20 +11:00
  • 5579fa5e0b Extract last used address finding into service object Rohan Mitchell 2015-12-11 12:08:45 +11:00
  • e33ede0ec2 Include order cycle status in new order form Rohan Mitchell 2015-12-11 10:30:55 +11:00
  • 76d4fbccf9 Use select2 for order cycle selection Rohan Mitchell 2015-12-11 07:38:53 +11:00
  • 60e971ad63 Take variant overrides into account for price when admin adds line item to order Rohan Mitchell 2015-12-10 11:47:18 +11:00
  • 222b390b31 Fix error display Rohan Mitchell 2015-12-04 15:00:52 +11:00
  • 932ac45ea5 Do not show form until distribution has been chosen Rohan Mitchell 2015-12-04 14:15:39 +11:00
  • 80ebaece2d Sort distribution choices by name Rohan Mitchell 2015-12-04 12:54:00 +11:00
  • 3419198635 Disable distributors that do not have an order cycle Rohan Mitchell 2015-12-04 12:51:18 +11:00
  • 1026b81d0c Do not show order cycle choice until distributor is chosen Rohan Mitchell 2015-12-04 12:24:46 +11:00
  • c74463404d Only show order cycle options that include the chosen distributor Rohan Mitchell 2015-12-04 12:16:45 +11:00
  • 2081744cf6 Fix spec Rohan Mitchell 2015-12-04 09:07:40 +11:00
  • cbaf2a0cb3 Angularise edit order form Rohan Mitchell 2015-12-04 09:03:44 +11:00
  • 6e7b6b5dfc Tidy render partial calls and hash syntax Rohan Mitchell 2015-12-04 08:50:38 +11:00
  • 815694de31 Move orders/edit template from Spree Rohan Mitchell 2015-12-04 08:48:54 +11:00
  • 2daceb1111 Angularise new order form Rohan Mitchell 2015-12-04 08:45:32 +11:00
  • eb07680f1f Inject shops and order cycles Rohan Mitchell 2015-12-02 13:27:51 +11:00
  • 47c23c986a Move distribution fields from override to partial Rohan Mitchell 2015-12-02 11:17:23 +11:00
  • 742e2279ae Tidy render partial calls Rohan Mitchell 2015-12-02 11:13:20 +11:00
  • eaae16a486 Copy orders/new template from Spree Rohan Mitchell 2015-12-02 11:12:29 +11:00
  • ae945ace9d Auto-merge from CI [skip ci] Continuous Integration 2015-12-11 11:09:54 +11:00
  • 9d5606a4fd Fix enterprise index page 500 Rohan Mitchell 2015-12-11 10:06:07 +11:00
  • cd7721a127 Using date and time of current timezone Maikel Linke 2015-12-04 16:40:15 +11:00
  • ee447c9ce6 Move blankOption service to admin.utils module Rohan Mitchell 2015-12-10 09:35:27 +11:00
  • eba2aae353 Copy StatusMessage to admin.utils module, eventually to be moved here Rohan Mitchell 2015-12-10 09:32:04 +11:00
  • c1a80b1e8f Require confirmation when saving an order cycle without distributors Rohan Mitchell 2015-11-25 12:08:46 +11:00
  • 6998df25e0 Fix indentation Rohan Mitchell 2015-11-25 11:51:32 +11:00
  • 921210012a Swap in StatusMessage service for custom message display in order cycles interface Rohan Mitchell 2015-11-24 17:13:54 +11:00