Commits on Jul 12, 2016
  1. Merge pull request #206 from jorix/a-fix_205

    Fix bug introduced by #205
    committed on GitHub Jul 12, 2016
Commits on Jul 11, 2016
  1. @jorix

    Fix bug introduced by #205

    Remove `true ||` forgotten that is used to force to show error messages on development.
    
    Sorry :-(
    jorix committed Jul 12, 2016
Commits on Jul 10, 2016
  1. Merge pull request #200 from jorix/a-nonEmpyCatrs

    The empty carts can cause errors to distribute and validate.
    committed on GitHub Jul 10, 2016
  2. Merge pull request #201 from jorix/a-chk_server_order

    The controller should check the order status.
    committed on GitHub Jul 10, 2016
  3. Merge pull request #202 from jorix/a-unit_id_smallint

    Change unit id from tinyint to smallint
    committed on GitHub Jul 10, 2016
  4. Merge pull request #203 from jorix/a-fix_193

    Fix bug introduced by #193
    committed on GitHub Jul 10, 2016
  5. Merge pull request #204 from jorix/a_cumulative_final_price

    Cumulative order: fix to uses final price.
    committed on GitHub Jul 10, 2016
  6. Merge pull request #205 from jorix/a-modif_order_closed

    On new order should check if order is already closed.
    committed on GitHub Jul 10, 2016
Commits on Jul 9, 2016
  1. @jorix

    Cumulative order: fix to uses final price.

    Current sql procedure `get_preorderable_products` returns two columns `unit_price` and the last column is without VAT and Rev.Tax. This erroneous column is used by `shop_and_order.php`.
    jorix committed Jul 9, 2016
  2. @jorix

    Fix bug introduced by #193

    Sorry my PR #193 causes a js error on `manage_orderable_products.php` and cumulative orders are not shown.
    jorix committed Jul 9, 2016
Commits on Jul 7, 2016
  1. @jorix

    On new order should check if order is already closed.

    "shop_and_order.php" allows add products when no exist a open date for order.
    
    As to reproduce:
     * Begin an order.
     * Close the order in another browser.
     * Add a product, oops! tells us that it has been successfully saved!!
       * but luckily!, the product is not added.
       * a new open order exist but we can't even see or close.
     * If we modify existing quantities also tells us that it has been successfully saved!!
       * but luckily!, not is true!
    
    This patch aims to prevent add products when closed date. And also notify to the user that their data has not been saved.
    jorix committed Jul 7, 2016
Commits on Jun 4, 2016
  1. @jorix

    Change unit id from tinyint to smallint

    Up to 127 units are many, but not sufficient for somebody.
    jorix committed Jun 4, 2016
  2. @jorix

    The controller should check the order status.

    "manage_orders.php" allows close an order if it is open when the list orders is displayed. But what happens if another user has closed the order after displaying the list? Yes... the order will be closed twice, and activating provider products fail!
    
    This patch proposes some controls on the server to prevent actions on orders that no longer have the state shown in the list or in the distribute page.
    jorix committed Jun 4, 2016
Commits on May 31, 2016
  1. @jorix

    The empty carts can cause errors to distribute and validate.

    The empty carts are reused for the same date, and also warns and cancel if there are pending validate products carts.
    jorix committed May 31, 2016
Commits on Jan 27, 2016
  1. Merge pull request #197 from jorix/a-changelog-es_plus

    Is documented in CHANGELOG-es more corrected issues.
    committed Jan 27, 2016
  2. Merge pull request #198 from jorix/a-new_year

    New year
    committed Jan 27, 2016
Commits on Jan 21, 2016
  1. @jorix

    New year

    It is convenient to show that Aixada continues.
    jorix committed Jan 21, 2016
  2. @jorix
Commits on Dec 14, 2015
  1. Merge pull request #196 from jorix/a-provider_balances

    manage_money: Show provider balances
    committed Dec 14, 2015
Commits on Dec 7, 2015
  1. @jorix

    manage_money: Show provider balances

    Show provider balances under HU balances (only wen config value: accounts=>accounts is true)
    jorix committed Dec 7, 2015
Commits on Nov 30, 2015
  1. Merge pull request #192 from jorix/a-order_is_not_closed

    Fix small mismatch presentation of not closed a order in index.php.
    committed Nov 30, 2015
  2. Merge pull request #193 from jorix/a-script_busy

    manage_orderable_products: long time to activate many products
    committed Nov 30, 2015
  3. Merge pull request #194 from jorix/a-import_iva

    Fix mismatch to import VAT.
    committed Nov 30, 2015
  4. Merge pull request #195 from jorix/a-email_hader_bug

    [PATCH] Remove extra space in email headers
    committed Nov 30, 2015
Commits on Nov 27, 2015
  1. @jorix

    [PATCH] Remove extra space in email headers

    With this extra space, the malformed Cc or Bcc header was considered as the
    first line of the body of the email, a new line was inserted before it. This
    new line was preventing the following headers (including Content-Type) to be
    interpreted as headers and the HTML email was displayed in plain text.
    (text by ricola)
    
    Reported by Josu in (https://lists.riseup.net/www/info/aixada-dev)[Aixada-Dev] and tested by ricola.
    
    Please merge, thanks.
    jorix committed Nov 27, 2015
Commits on Nov 24, 2015
  1. @jorix

    Fix mismatch to import VAT.

    Field `iva_percent_type_id` does not exit in database, right name is `iva_percent_id`
    jorix committed Nov 24, 2015
Commits on Nov 15, 2015
  1. @jorix

    manage_orderable_products: It takes a long time to turn on many produ…

    …cts.
    
    When a provider has a lot products (eg over 560) when provider is select it may cause the browser detects excessive time execution and ask *"A script on this page may be busy... continue?"*
    
    Patch proposed optimizes the code and fixes a case where `$('.loadSpinner')` is not displayed when the browser is working.
    Note:The main improvement is due to usage of new array `gdatesIsPast[]` that stores if a date is in the past or not.
    jorix committed Nov 15, 2015
Commits on Nov 9, 2015
  1. @jorix

    Fix small mismatch presentation of not closed a order in index.php.

    Fix a small mismatch presentation on `index.php` that showed as `Closed` a order to close today. After this patch shows 0 as days to close instead of *"order is closed"*. Also show order to close today in *"Upcoming orders"* tab. (see similar issue on #176)
    jorix committed Nov 9, 2015
Commits on Aug 15, 2015
  1. Merge pull request #188 from jorix/a-development

    Option $development is still used.
    committed Aug 15, 2015
  2. Merge pull request #189 from jorix/a-chk_js-2

    Fix js undeclared vars and other check using Closure Compiler.
    committed Aug 15, 2015
  3. Merge pull request #190 from jorix/a-help

    Help: add "How to see my balance money?" and translate to "ca" and "en"
    committed Aug 15, 2015
Commits on Aug 3, 2015
  1. @jorix
Commits on Jul 15, 2015
  1. @jorix

    Fix js undeclared vars and other check using Closure Compiler.

    Note that the deleted lines (3 lines) on `manage_providers.php` cause a js errors and consequently controller error messages are not displayed.
    jorix committed Jul 15, 2015
Commits on Jul 14, 2015
  1. @jorix

    Option $development is still used.

    Used by: `php\inc\authentication.inc.php`  and `php\utilities\useruf.php`
    jorix committed Jul 14, 2015
Commits on Jul 13, 2015
  1. Merge pull request #186 from jorix/a-delete_unused

    Remove unused code
    committed Jul 13, 2015