Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Merge of "w/in-commerce/branches/5.2.x@16423" to "w/in-commerce/branches/5.3.x@16398".

[backported] Bug INP-1607 - PHP 7 compatibility issues

Merge of "w/in-commerce/branches/5.2.x@16385" to "w/in-commerce/branches/5.3.x@16392".

Conflicts:

  • admin_templates/orders/export/export.tpl
  • units/addresses/addresses_config.php
  • units/affiliate_payments/affiliate_payments_config.php
  • units/affiliates/affiliates_config.php
  • units/coupons/coupons_config.php
  • units/currencies/currencies_config.php
  • units/gateways/gateways_config.php
  • units/manufacturers/manufacturers_config.php
  • units/order_items/order_items_config.php
  • units/orders/orders_config.php
  • units/orders/orders_event_handler.php
  • units/orders/orders_tag_processor.php
  • units/product_option_combinations/product_option_combinations_config.php
  • units/products/products_config.php
  • units/reports/reports_config.php
    • -34
    • +73
    ./5.3.x/units/orders/orders_tag_processor.php
    • -13
    • +23
    ./5.3.x/units/orders/orders_config.php
    • -6
    • +13
    ./5.3.x/units/orders/orders_item.php
    • -4
    • +3
    ./5.3.x/units/orders/order_validator.php
    • -1
    • +18
    ./5.3.x/units/gateways/gateways_config.php
    • -70
    • +130
    ./5.3.x/units/orders/orders_event_handler.php
    • -4
    • +4
    ./5.3.x/units/orders/order_calculator.php

Merge of "w/in-commerce/releases/5.2.1-B1@15631" to "w/in-commerce/branches/5.3.x@15656".

1. restored changes, that were lost during inaccurate merge conflict resolution

    • -2
    • +2
    ./5.3.x/units/orders/orders_config.php

Bug INP-1579 - Remove "ItemSQLs" from unit configs

    • -177
    • +182
    ./5.2.x/units/shipping/shipping_config.php
    • -43
    • +48
    ./5.2.x/units/brackets/brackets_config.php
    • -543
    • +538
    ./5.2.x/units/orders/orders_config.php
    • -147
    • +152
    ./5.2.x/units/coupons/coupons_config.php
    • -114
    • +117
    ./5.2.x/units/discounts/discounts_config.php
  1. … 22 more files in changeset.

Fixes MINC-176 - Register missing classes in class factory

Differential Revision: http://qa.in-portal.org/D233

    • -3
    • +21
    ./5.2.x/units/gateways/gateways_config.php
    • -4
    • +3
    ./5.2.x/units/orders/order_validator.php
    • -10
    • +6
    ./5.2.x/units/orders/orders_event_handler.php
    • -12
    • +8
    ./5.2.x/units/orders/orders_tag_processor.php

Bug INP-1487 - Create empty search result table, when search keyword is too short

Differential Revision: http://qa.in-portal.org/D158

Bug INP-1554 - Allow searching category items by meta fields

Differential Revision: http://qa.in-portal.org/D217

Fixes MINC-138 - On user login/registration update Order user via "OrdersItem" object

Differential Revision: http://qa.in-portal.org/D183

Fixes MINC-140 - Assign last order to user registered after checkout process

Differential Revision: http://qa.in-portal.org/D184

    • -2
    • +2
    ./5.2.x/units/orders/orders_config.php

Fixes MINC-143 - Use table aliases in "ord" unit calculated fields

Differential Revision: http://qa.in-portal.org/D187

    • -10
    • +10
    ./5.2.x/units/orders/orders_config.php

Fixes MINC-145 - Modernize "orditems:LinkRemoveFromCart" tag

Differential Revision: http://qa.in-portal.org/D192

    • -1
    • +11
    ./5.2.x/units/orders/orders_tag_processor.php

Fixes MINC-146 - Modernize "orditems:RemoveCouponLink" tag

Differential Revision: http://qa.in-portal.org/D193

    • -7
    • +11
    ./5.2.x/units/orders/orders_tag_processor.php

Bug INP-1557 - Use "http_build_query" to escape url parameters

  1. … 10 more files in changeset.

Bug INP-1511 - Presets for category items export

Differential Revision: http://qa.in-portal.org/D162

    • -0
    • +12
    ./5.3.x/units/products/products_config.php
    • -119
    • +2
    ./5.3.x/admin_templates/orders/export/export.tpl

Bug INP-1521 - Don't expose InitList and PrintList tag communication to Web Request

Differential Revision: http://qa.in-portal.org/D175

Fixes MINC-135 - Use shipping type from Order, when editing in Admin Console

Differential Revision: http://qa.in-portal.org/D164

Fixes MINC-134 - Lock tables to generate unique order numbers

Differential Revision: http://qa.in-portal.org/D141

    • -10
    • +64
    ./5.2.x/units/orders/orders_event_handler.php
    • -0
    • +10
    ./5.2.x/units/orders/orders_config.php

Fixes MINC-133 - Don't run "OrdersEventHandler::CheckUser" method in CRON

Differential Revision: http://qa.in-portal.org/D131

Fixes MINC-132 - Round discounted/couponed price on MySQL side

Differential Revision: http://qa.in-portal.org/D125

    • -4
    • +4
    ./5.2.x/units/orders/order_calculator.php

Fixes MINC-131 - No reservation on multi-order save

Differential Revision: http://qa.in-portal.org/D104

Bug INP-1481 - Add missing "svn:keywords" properties to PHP files (5.3.x)

Differential Revision: http://qa.in-portal.org/D134

    • -0
    • +0
    ./5.3.x/units/products/ProductRouter.php
    • -0
    • +0
    ./5.3.x/install/cache/class_structure.php

Fixes MINC-127 - Optimize "ord:UsingCreditCard" tag

Differential Revision: http://qa.in-portal.org/D81

    • -14
    • +43
    ./5.2.x/units/orders/orders_tag_processor.php

Fixes MINC-119 - Reset more fields during cloning

Differential Revision: http://qa.in-portal.org/D51

    • -6
    • +14
    ./5.2.x/units/orders/orders_event_handler.php

Fixes MINC-120 - Make tangible item detection in order temp-table aware

Differential Revision: http://qa.in-portal.org/D54

    • -6
    • +13
    ./5.2.x/units/orders/orders_item.php

Fixes MINC-125 - Use grid name during order export

Differential Revision: http://qa.in-portal.org/D75

    • -17
    • +1
    ./5.2.x/units/orders/orders_event_handler.php

Fixes MINC-126 - Print all selected orders

Differential Revision: http://qa.in-portal.org/D80

Fixes MINC-128 - SQL error, when splitting an order

Differential Revision: http://qa.in-portal.org/D82

Fixes MINC-129 - Shipment number isn't reset during order split

Differential Revision: http://qa.in-portal.org/D83

    • -6
    • +12
    ./5.2.x/units/orders/orders_event_handler.php

Fixes MINC-130 - Get next available sub-number during order split from database

Differential Revision: http://qa.in-portal.org/D87