commented usps model for shipping methods modification
modified payment modules to have progress loader when initiate confirm order during checkout - modules: pp_standard cod authorizenet_sim authorizenet_aim authorizenet_sim_callback
added master_order list and info view and controller and modified default order to query orders by affiliateID
added some model functions to csv import and added dynamic manufacturer_id and category_id matcher in the csv_import controller | still needs testing though
fixed pagination moved in contetn div block
added filter by name in unlinked products
added affiliate_id to this_cart_getProducts and added recurring payments to controller for checkout confirm
cleaned up confirm checkout code and fixed some minor warnings during testing
fixed broken order_master/info method Had renamed the model method getOrder()
fixed loader gif and added some css to loader div
finished ebay_cron and did some testing with ebay api sandbox account
final touches before moving to remote server then start more testing from there
Merge branch 'inventory'
Merge branch 'master' of https://github.com/handmdmr46/bikesalvage.com into shipping