Albert Santoni
9c14cfd47c
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 12:27:01 -04:00
Albert Santoni
14113f7e60
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 12:26:45 -04:00
Albert Santoni
585a2859a6
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now
2014-07-03 12:26:20 -04:00
Albert Santoni
a5822aa07a
CORS refactoring
2014-07-03 12:26:09 -04:00
drigato
ac930607ad
Redirect index action to upgrade action
2014-07-03 11:08:54 -04:00
Albert Santoni
758423a7f7
Billing page fix for customers with multiple stations
2014-07-02 14:47:10 -04:00
Albert Santoni
35e98e468d
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
2014-07-02 13:43:09 -04:00
Albert Santoni
2794ca1355
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/models/Cache.php
2014-07-02 12:34:33 -04:00
Albert Santoni
728fccc2fe
Fixed Upgrade caching bugs
2014-07-02 12:30:52 -04:00
Albert Santoni
9de92a87a4
Refactored the upgrade process for Airtime Pro
2014-07-01 13:36:09 -04:00
Albert Santoni
e9cca4c441
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-27 15:50:51 -04:00
Albert Santoni
3357c1f032
Select current plan and show that correctly
2014-06-27 15:50:05 -04:00
Albert Santoni
907c53b94f
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-26 19:14:07 -04:00
Albert Santoni
2504a34818
Fallback to letting VAT validate if the VIES service is down
2014-06-26 19:13:40 -04:00
Albert Santoni
54590de6ee
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-26 18:59:14 -04:00
Albert Santoni
5745288113
Redirect Edit User screen for super admins
2014-06-26 18:58:03 -04:00
Albert Santoni
fe0485e66b
Invoice view bugfix
2014-06-26 18:04:37 -04:00
Albert Santoni
d34c0d91cd
Invoice view bugfix
2014-06-26 18:03:40 -04:00
Albert Santoni
f1610485c3
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-26 17:45:48 -04:00
Albert Santoni
d785d92953
VAT fixes
2014-06-26 17:44:53 -04:00
Albert Santoni
18c828defd
Finished up VAT validation for Plans page
2014-06-26 17:31:34 -04:00
Albert Santoni
51b7fe9adf
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-25 20:33:10 -04:00
Albert Santoni
fce6116d60
Made the invoices view nice!
2014-06-25 20:01:14 -04:00
Albert Santoni
338fd06f81
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-25 19:03:13 -04:00
Albert Santoni
d92e5197e1
Design and overhaul of Account Plans screen
...
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
Albert Santoni
bb21f08d87
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Auth.php
2014-06-25 11:18:56 -04:00
Albert Santoni
15013afa40
Better session handling fix
2014-06-25 11:15:14 -04:00
drigato
6f1727d8f3
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now
...
Conflicts:
airtime_mvc/application/controllers/BillingController.php
2014-06-24 16:26:06 -04:00
drigato
bfb5631105
Removed hardcoded client ids.
...
Added a function that calculates vat and adds it to an invoice
2014-06-24 16:23:23 -04:00
Albert Santoni
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
drigato
5d69ba5f91
Custom fields were not saving
2014-06-24 12:51:02 -04:00
drigato
73724bdd04
Custom fields were not saving
2014-06-24 12:46:11 -04:00
drigato
3307cc8645
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now
2014-06-23 17:04:50 -04:00
drigato
806525e28c
Fetch service id from whmcs api for upgrades
2014-06-23 17:04:23 -04:00
Albert Santoni
da6263c677
Merge branch 'cc-5709-airtime-analyzer-saas' into saas
2014-06-23 16:27:38 -04:00
Albert Santoni
701139e433
Merge branch 'gtm-saas' into cc-5709-airtime-analyzer-saas
2014-06-23 15:45:03 -04:00
Albert Santoni
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
Albert Santoni
24d842c4a6
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-06-23 15:26:53 -04:00
Albert Santoni
a2bef67d33
Fix user session storage in multi-tenancy mode
2014-06-23 15:22:44 -04:00
Albert Santoni
380b5526d6
Merge branch 'whmcs-login-saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 13:25:40 -04:00
Albert Santoni
3919fbd839
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-23 13:25:19 -04:00
Albert Santoni
55ff95a34f
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-23 13:24:47 -04:00
Albert Santoni
6302e3b335
Fix CORS with Chrome
2014-06-23 13:24:28 -04:00
drigato
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
drigato
0439413ac0
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 17:46:08 -04:00
Albert Santoni
e43c1c00cf
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 17:43:37 -04:00
Albert Santoni
0eab0c609b
Permissions fixes for Super Admin users
2014-06-20 17:43:20 -04:00
drigato
497841225b
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 16:54:41 -04:00
drigato
f6a4a9d0d0
Removed invalid client id - for testing purposes
2014-06-20 16:54:05 -04:00
Albert Santoni
7275986158
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 16:42:18 -04:00
