Duncan Sommerville
795e239ff3
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
2014-11-06 18:39:48 -05:00
Duncan Sommerville
5275669211
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
Duncan Sommerville
1a90184a69
Merging 2.5.x into saas
2014-10-27 16:27:45 -04:00
Duncan Sommerville
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
Robbt
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -04:00
Robert Elder
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
drigato
c4692cc0d7
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/PluploadController.php
airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
dpsommer
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
Robert Elder
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
Robert Elder
5c69eda010
Tokens for Stream Settings page.
2014-10-01 20:55:07 +00:00
Robert Elder
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
Robert Elder
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
Duncan Sommerville
3be8e10691
Removed unneccessary upload-image view
2014-09-16 18:16:28 -04:00
Duncan Sommerville
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
drigato
2cc7557cb7
Remove php short tag for better compatibility
2014-08-29 17:10:55 -04:00
Albert Santoni
1c676dee6d
Fix user settings again for Super Admins, also Zend routing tweak
...
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
2014-08-01 12:50:02 -04:00
Albert Santoni
d320651735
SAAS-461: Re-enable timezone and language settings for Super Admins
2014-07-28 12:37:40 -04:00
Albert Santoni
e759b8969b
Fix undefined variable
2014-07-25 15:18:17 -04:00
Albert Santoni
b8a9d72da6
Give Submit Order button an ID for GTM
2014-07-11 16:37:48 -04:00
Albert Santoni
52b8f3af87
Show plan updated confirmation on invoices page
2014-07-09 14:06:51 -04:00
Albert Santoni
0b41cd1d38
Validate VAT every time the Account Plans page loads
2014-07-07 15:20:41 -04:00
Albert Santoni
3c88f66162
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 17:13:06 -04:00
Albert Santoni
64d3cb7b1b
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 17:12:50 -04:00
Albert Santoni
63113b4e75
Fix for Chrome radio button disabling
2014-07-03 17:12:33 -04:00
Albert Santoni
e18a281991
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 16:53:11 -04:00
Albert Santoni
e8bc6a3080
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:53:01 -04:00
Albert Santoni
dea68878f4
Fix for radio button disabling bug in Billing view
2014-07-03 16:51:59 -04:00
Albert Santoni
cda812dd73
Trialbox: Don't open My Account in new window
2014-07-02 14:49:11 -04:00
Albert Santoni
523bb8e7b6
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-02 12:45:44 -04:00
Albert Santoni
b0cab62e80
More syntax fixes for PHP 5.3
2014-07-02 12:45:17 -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
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
94bbd3c8a5
Don't open trialbox My Account link in new window
2014-06-25 20:36:08 -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
b36967a690
Nicer auto-styling for the Billing Details form
2014-06-25 20:32:41 -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
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
drigato
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
drigato
497841225b
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 16:54:41 -04:00
drigato
1e1dc1dd03
Validation
...
Refactoring
2014-06-20 16:31:26 -04:00
drigato
01bf2883e5
Save client info on upgrade
2014-06-20 15:00:28 -04:00
Albert Santoni
faa12c8065
Super Admin edit page points to billing now
...
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
drigato
40f2796972
Created an invoice view
...
Some refactoring
Some validation
2014-06-19 16:55:01 -04:00
drigato
1f4c8b755d
Created a separate view for upgrades and client info
2014-06-17 12:47:08 -04:00
drigato
81ceafbfbd
whmcs client form
2014-06-12 17:54:20 -04:00
