Skip to content

Commit

Permalink
closes #1015 - 'customer' to 'client' including all translations
Browse files Browse the repository at this point in the history
  • Loading branch information
@shoulders
shoulders committed Jul 21, 2018
1 parent 5fbd8b5 commit a0e7212
Show file tree
Hide file tree
Showing 139 changed files with 1,182 additions and 1,179 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Expand Up @@ -257,7 +257,7 @@ in one of these ways:
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
long as you offer spare parts or client support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -34,7 +34,7 @@ QWcrm has many features, not all can be listed here:

* Employees and roles
* Configurable permissions
* Customer Management
* Client Management
* Work Order (Jobs/Tasks) Management
* Work Order Scheduling
* Invoicing
Expand Down
46 changes: 23 additions & 23 deletions src/components/_includes/administrator.php
View file
Expand Up @@ -99,7 +99,7 @@ function update_acl($permissions) {
`Technician` =". $db->qstr( $page_permission['Technician'] ).",
`Clerical` =". $db->qstr( $page_permission['Clerical'] ).",
`Counter` =". $db->qstr( $page_permission['Counter'] ).",
`Customer` =". $db->qstr( $page_permission['Customer'] ).",
`Client` =". $db->qstr( $page_permission['Client'] ).",
`Guest` =". $db->qstr( $page_permission['Guest'] ).",
`Public` =". $db->qstr( $page_permission['Public'] )."
WHERE `page` =". $db->qstr( $page_name ).";";
Expand All @@ -118,24 +118,24 @@ function update_acl($permissions) {
array(

// Permission always granted for all
'core:403' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Customer' => '1', 'Guest' => '1', 'Public' => '1'),
'core:404' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Customer' => '1', 'Guest' => '1', 'Public' => '1'),
'core:error' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Customer' => '1', 'Guest' => '1', 'Public' => '1'),
'core:home' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Customer' => '1', 'Guest' => '1', 'Public' => '1'),
'core:maintenance' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Customer' => '1', 'Guest' => '1', 'Public' => '1'),
'user:login' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Customer' => '1', 'Guest' => '1', 'Public' => '1'),
'core:403' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Client' => '1', 'Guest' => '1', 'Public' => '1'),
'core:404' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Client' => '1', 'Guest' => '1', 'Public' => '1'),
'core:error' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Client' => '1', 'Guest' => '1', 'Public' => '1'),
'core:home' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Client' => '1', 'Guest' => '1', 'Public' => '1'),
'core:maintenance' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Client' => '1', 'Guest' => '1', 'Public' => '1'),
'user:login' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Client' => '1', 'Guest' => '1', 'Public' => '1'),

// Mixed Permissions
//'core:dashboard' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Customer' => '0', 'Guest' => '0', 'Public' => '0'),
//'core:dashboard' => array('Administrator' => '1', 'Manager' => '1', 'Supervisor' => '1', 'Technician' =>'1', 'Clerical' => '1', 'Counter' => '1', 'Client' => '0', 'Guest' => '0', 'Public' => '0'),

// Administrator Only
//'administrator:acl' => array('Administrator' => '1', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Customer' => '0', 'Guest' => '0', 'Public' => '0'),
//'administrator:acl' => array('Administrator' => '1', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Client' => '0', 'Guest' => '0', 'Public' => '0'),

// Permissions always removed for all
'setup:install' => array('Administrator' => '0', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Customer' => '0', 'Guest' => '0', 'Public' => '0'),
'setup:choice' => array('Administrator' => '0', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Customer' => '0', 'Guest' => '0', 'Public' => '0'),
'setup:migrate' => array('Administrator' => '0', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Customer' => '0', 'Guest' => '0', 'Public' => '0'),
'setup:upgrade' => array('Administrator' => '0', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Customer' => '0', 'Guest' => '0', 'Public' => '0')
'setup:install' => array('Administrator' => '0', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Client' => '0', 'Guest' => '0', 'Public' => '0'),
'setup:choice' => array('Administrator' => '0', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Client' => '0', 'Guest' => '0', 'Public' => '0'),
'setup:migrate' => array('Administrator' => '0', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Client' => '0', 'Guest' => '0', 'Public' => '0'),
'setup:upgrade' => array('Administrator' => '0', 'Manager' => '0', 'Supervisor' => '0', 'Technician' =>'0', 'Clerical' => '0', 'Counter' => '0', 'Client' => '0', 'Guest' => '0', 'Public' => '0')

);

Expand All @@ -149,7 +149,7 @@ function update_acl($permissions) {
`Technician` =". $db->qstr( $page_permission['Technician'] ).",
`Clerical` =". $db->qstr( $page_permission['Clerical'] ).",
`Counter` =". $db->qstr( $page_permission['Counter'] ).",
`Customer` =". $db->qstr( $page_permission['Customer'] ).",
`Client` =". $db->qstr( $page_permission['Client'] ).",
`Guest` =". $db->qstr( $page_permission['Guest'] ).",
`Public` =". $db->qstr( $page_permission['Public'] )."
WHERE `page` =". $db->qstr( $page_name ).";";
Expand Down Expand Up @@ -465,7 +465,7 @@ function reset_acl_permissions() {
} else {

// Insert default permissions
$sql = "INSERT INTO `".PRFX."user_acl_page` (`page`, `Administrator`, `Manager`, `Supervisor`, `Technician`, `Clerical`, `Counter`, `Customer`, `Guest`, `Public`) VALUES
$sql = "INSERT INTO `".PRFX."user_acl_page` (`page`, `Administrator`, `Manager`, `Supervisor`, `Technician`, `Clerical`, `Counter`, `Client`, `Guest`, `Public`) VALUES
('administrator:acl', 1, 0, 0, 0, 0, 0, 0, 0, 0),
('administrator:config', 1, 0, 0, 0, 0, 0, 0, 0, 0),
('administrator:phpinfo', 1, 0, 0, 0, 0, 0, 0, 0, 0),
Expand All @@ -478,14 +478,14 @@ function reset_acl_permissions() {
('core:error', 1, 1, 1, 1, 1, 1, 1, 1, 1),
('core:home', 1, 1, 1, 1, 1, 1, 1, 1, 1),
('core:maintenance', 1, 1, 1, 1, 1, 1, 1, 1, 1),
('customer:delete', 1, 1, 1, 0, 1, 0, 0, 0, 0),
('customer:details', 1, 1, 1, 1, 1, 1, 0, 0, 0),
('customer:edit', 1, 1, 1, 1, 1, 0, 0, 0, 0),
('customer:new', 1, 1, 1, 1, 1, 1, 0, 0, 0),
('customer:note_delete', 1, 1, 1, 1, 1, 0, 0, 0, 0),
('customer:note_edit', 1, 1, 1, 1, 1, 0, 0, 0, 0),
('customer:note_new', 1, 1, 1, 1, 1, 1, 0, 0, 0),
('customer:search', 1, 1, 1, 1, 1, 1, 0, 0, 0),
('client:delete', 1, 1, 1, 0, 1, 0, 0, 0, 0),
('client:details', 1, 1, 1, 1, 1, 1, 0, 0, 0),
('client:edit', 1, 1, 1, 1, 1, 0, 0, 0, 0),
('client:new', 1, 1, 1, 1, 1, 1, 0, 0, 0),
('client:note_delete', 1, 1, 1, 1, 1, 0, 0, 0, 0),
('client:note_edit', 1, 1, 1, 1, 1, 0, 0, 0, 0),
('client:note_new', 1, 1, 1, 1, 1, 1, 0, 0, 0),
('client:search', 1, 1, 1, 1, 1, 1, 0, 0, 0),
('expense:delete', 1, 1, 0, 0, 1, 0, 0, 0, 0),
('expense:details', 1, 1, 0, 0, 1, 0, 0, 0, 0),
('expense:edit', 1, 1, 0, 0, 1, 0, 0, 0, 0),
Expand Down

0 comments on commit a0e7212

Please sign in to comment.