Fisheye: changeset 16522

Alex

committed

16522

on 20 Jan 17

Merge of "w/in-commerce/branches/5.2.x@16516" to "w/in-commerce/branches/5.3.x@16506".

Conflicts:
* units/coupons/coupons_event_handler.ph… Show more

Merge of "w/in-commerce/branches/5.2.x@16516" to "w/in-commerce/branches/5.3.x@16506".

Conflicts:

units/coupons/coupons_event_handler.php

Show less

16506

5.3.x

Options

branches 5.3.x
- install
  - File upgrades.php
- File install.php
- units
  - addresses
    - File addresses_event_handler.php
    - File addresses_tag_processor.php
  - affiliate_payment_types
    - File affiliate_payment_types_event_handler.php
    - File affiliate_payment_types_tp.php
  - affiliate_payments
    - File affiliate_payments_event_handler.php
  - affiliate_plans
    - File affiliate_plans_event_handler.php
  - affiliate_plans_brackets
    - File affiliate_plans_brackets_event_handler.php
    - File affiliate_plans_brackets_tag_processor.php
  - affiliate_plans_items
    - File affiliate_plans_items_tag_processor.php
  - affiliates
    - File affiliates_event_handler.php
    - File affiliates_tag_processor.php
  - brackets
    - File brackets_event_handler.php
    - File brackets_tag_processor.php
  - coupon_items
    - File coupon_items_tag_processor.php
  - coupons
    - File coupons_event_handler.php
  - currencies
    - File currencies_event_handler.php
    - File currencies_tag_processor.php
  - destinations
    - File dst_event_handler.php
  - discount_items
    - File discount_items_tag_processor.php
  - discounts
    - File discounts_event_handler.php
  - downloads
    - File download_helper.php
  - files
    - File files_event_handler.php
  - gateways
    - gw_classes
      - File authorizenet.php
      - File google_checkout.php
      - File gw_base.php
      - File ideal_nl.php
      - notify_scripts
        
        File google_checkout_notify.php
        
        File google_checkout_shippings.php
      - File paymentech.php
      - File paypal.php
      - File paypal_direct.php
      - File rightconnect.php
      - File sella_guestpay.php
      - File worldpay.php
    - File gw_event_handler.php
    - File gw_tag_processor.php
  - gift_certificates
    - File gift_certificates_eh.php
    - File gift_certificates_tp.php
  - helpers
    - File bank_lv_currency_rates.php
    - File currency_rates.php
    - File ecb_currency_rates.php
    - File frny_currency_rates.php
    - File order_helper.php
  - manufacturers
    - File manufacturers_event_handler.php
  - order_items
    - File order_items_event_handler.php
    - File order_items_tag_processor.php
  - orders
    - File order_calculator.php
    - File order_manager.php
    - File orders_event_handler.php
    - File orders_item.php
    - File orders_tag_processor.php
  - payment_type
    - File payment_type_event_handler.php
  - payment_type_currencies
    - File payment_type_currencies_event_handler.php
  - pricing
    - File pricing_event_handler.php
    - File pricing_tag_processor.php
  - product_option_combinations
    - File product_option_combinations_event_handler.php
  - product_options
    - File product_options_event_handler.php
    - File product_options_tag_processor.php
  - products
    - File products_event_handler.php
    - File products_tag_processor.php
  - reports
    - File reports_event_handler.php
    - File reports_tag_processor.php
  - shipping
    - File shipping_event_handler.php
    - File shipping_tag_processor.php
  - shipping_costs
    - File shipping_costs_event_handler.php
  - shipping_quote_engines
    - File custom_shipping_quote_engine.php
    - File intershipper.php
    - File shipping_quote_collector.php
    - File shipping_quote_engine_event_handler.php
    - File usps.php
  - taxes
    - File taxes_event_handler.php
    - File taxes_tag_processor.php
  - taxesdestinations
    - File taxes_dst_event_handler.php
  - zones
    - File zones_event_handler.php
    - File zones_tag_processor.php