Changeset [8214bd1039a961ada5e32b525c7eb20a010409c9] by dogmatic69
Revision 8214bd1039a961ada5e32b525c7eb20a010409c9,
committed by dogmatic69
· July 10th, 2010 @ 10:32 AM
Merge branch 'dev' of github.com:infinitas/infinitas into
dev
http://github.com/infinitas/infinitas/commit/8214bd1039a961ada5e32b...
23 changed files
-
A
infinitas/shop/plugins/order/controllers/payments_controller.php -
A
infinitas/shop/plugins/order/models/payment.php -
A
infinitas/shop/plugins/order/views/orders/admin_view.ctp -
A
infinitas/shop/plugins/order/views/orders/pay_now.ctp -
A
infinitas/shop/plugins/order/views/payments/admin_add.ctp -
A
infinitas/shop/plugins/order/views/payments/admin_index.ctp -
A
infinitas/shop/plugins/payment_eft/config/config.php -
A
infinitas/shop/plugins/payment_eft/payment_eft_app_controller.php -
A
infinitas/shop/plugins/payment_eft/payment_eft_events.php -
A
infinitas/shop/plugins/payment_eft/views/elements/payment.ctp -
A
infinitas/shop/plugins/payment_eft/webroot/img/eft.png -
M
app_helper.php -
M
extensions/libs/controllers/components/infinitas.php -
M
infinitas/management/views/users/admin_login.ctp -
M
infinitas/management/views/users/login.ctp -
M
infinitas/management/views/users/register.ctp -
M
infinitas/management/views/users/reset_password.ctp -
M
infinitas/shop/controllers/products_controller.php -
M
infinitas/shop/plugins/order/controllers/orders_controller.php -
M
infinitas/shop/plugins/order/models/order.php -
M
infinitas/shop/plugins/order/views/orders/admin_index.ctp -
M
infinitas/shop/plugins/order/views/orders/pay.ctp -
M
infinitas/shop/views/helpers/shop.php