16 Commits

Author SHA1 Message Date
Daniel Camargo
518f302ebb partial #2243 - add the ability to pay using stripe or balanced in the order.php
Updated the Stripe API (php) to the new version (from 1.7.2 to 1.10.1).

Updated the keys (public and secret) of the test env (config.xml). I was afraid to change it from the live one.

I changed the way the user_payment_type was working.
Now the user will be able to have two actives payment types, one for stripe and another for balanced.

When you call the method Crunchbutton_User_Payment_Type::getUserPaymentType() it will return the active payment type for the current processor.

I have also created this method Crunchbutton_User_Payment_Type::processor() returns the current processor type and replaced all the calls from c::config()->processor to this method. That way if we decide to put this data at config’s table we will have to just change this method. Or even is we need to use the processor type that is previously stored that will be easy too.

I created two new files tokenizeCard.stripe.js and tokenizeCard.balanced.js and moved the method App.tokenizeCard to these files
2013-12-18 14:43:22 -02:00
Daniel Camargo
f5b1040fdb partial #2242 - separate user and payment type table 2013-12-17 14:50:20 -02:00
arzynik
40411638e9 hide errors 2013-11-30 14:10:17 -08:00
Daniel Camargo
bcd67a3e5f partial #2055 2013-11-12 17:21:18 -02:00
Daniel Camargo
f438557e7c partial #1055 - let users who registered with email or facebook also log in with their phone number and be able to reset password with their phone number 2013-04-17 14:14:34 -03:00
Daniel Camargo
911a8cbef8 Issue #775 2013-02-28 13:37:30 -03:00
pererinha
cd0a3eb09b partial #13 2013-02-08 12:30:09 -02:00
Daniel Camargo
7bce4d3a13 partial #13
Changing the email subject
2013-02-07 16:43:04 -02:00
Daniel Camargo
c3afebad20 partial #13 send email and sms 2013-02-07 10:37:45 -02:00
Daniel Camargo
5a0179e8a1 partial #13
Fixed the Auth model.
2013-02-06 17:21:23 -02:00
Daniel Camargo
15521c0071 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	www/assets/js/app.js
2013-02-06 16:55:33 -02:00
Daniel Camargo
0704be0911 partial #13 2013-02-06 16:29:40 -02:00
Daniel Camargo
1e4adcb494 partial #13 2013-02-05 17:02:36 -02:00
Daniel Camargo
80c720fe38 partial #13 2013-02-04 18:04:01 -02:00
Daniel Camargo
fe18dc7aef partial #13 2013-02-02 19:18:25 -02:00
arzynik
69bd3d91d1 initial 2012-06-20 21:39:23 -07:00