@@ -174,7 +174,7 @@
-
+
diff --git a/assets/js/http/categories_http_client.js b/assets/js/http/service_categories_http_client.js
similarity index 56%
rename from assets/js/http/categories_http_client.js
rename to assets/js/http/service_categories_http_client.js
index d83c43f0..f2953c4d 100644
--- a/assets/js/http/categories_http_client.js
+++ b/assets/js/http/service_categories_http_client.js
@@ -10,78 +10,78 @@
* ---------------------------------------------------------------------------- */
/**
- * Categories HTTP client.
+ * Service-categories HTTP client.
*
- * This module implements the categories related HTTP requests.
+ * This module implements the service-categories related HTTP requests.
*/
-App.Http.Categories = (function () {
+App.Http.ServiceCategories = (function () {
/**
- * Save (create or update) a category.
+ * Save (create or update) a service-category.
*
- * @param {Object} category
+ * @param {Object} serviceCategory
*
* @return {Object}
*/
- function save(category) {
- return category.id ? update(category) : create(category);
+ function save(serviceCategory) {
+ return serviceCategory.id ? update(serviceCategory) : create(serviceCategory);
}
/**
- * Create a category.
+ * Create a service-category.
*
- * @param {Object} category
+ * @param {Object} serviceCategory
*
* @return {Object}
*/
- function create(category) {
- const url = App.Utils.Url.siteUrl('categories/create');
+ function create(serviceCategory) {
+ const url = App.Utils.Url.siteUrl('service_categories/create');
const data = {
csrf_token: vars('csrf_token'),
- category: category
+ service_category: serviceCategory
};
return $.post(url, data);
}
/**
- * Update a category.
+ * Update a service-category.
*
- * @param {Object} category
+ * @param {Object} serviceCategory
*
* @return {Object}
*/
- function update(category) {
- const url = App.Utils.Url.siteUrl('categories/update');
+ function update(serviceCategory) {
+ const url = App.Utils.Url.siteUrl('service_categories/update');
const data = {
csrf_token: vars('csrf_token'),
- category: category
+ service_category: serviceCategory
};
return $.post(url, data);
}
/**
- * Delete a category.
+ * Delete a service-category.
*
- * @param {Number} categoryId
+ * @param {Number} serviceCategoryId
*
* @return {Object}
*/
- function destroy(categoryId) {
- const url = App.Utils.Url.siteUrl('categories/destroy');
+ function destroy(serviceCategoryId) {
+ const url = App.Utils.Url.siteUrl('service_categories/destroy');
const data = {
csrf_token: vars('csrf_token'),
- category_id: categoryId
+ service_category_id: serviceCategoryId
};
return $.post(url, data);
}
/**
- * Search categories by keyword.
+ * Search service-categories by keyword.
*
* @param {String} keyword
* @param {Number} [limit]
@@ -91,7 +91,7 @@ App.Http.Categories = (function () {
* @return {Object}
*/
function search(keyword, limit = null, offset = null, orderBy = null) {
- const url = App.Utils.Url.siteUrl('categories/search');
+ const url = App.Utils.Url.siteUrl('service_categories/search');
const data = {
csrf_token: vars('csrf_token'),
@@ -105,18 +105,18 @@ App.Http.Categories = (function () {
}
/**
- * Find a category.
+ * Find a service-category.
*
- * @param {Number} categoryId
+ * @param {Number} serviceCategoryId
*
* @return {Object}
*/
- function find(categoryId) {
- const url = App.Utils.Url.siteUrl('categories/find');
+ function find(serviceCategoryId) {
+ const url = App.Utils.Url.siteUrl('service_categories/find');
const data = {
csrf_token: vars('csrf_token'),
- category_id: categoryId
+ service_category_id: serviceCategoryId
};
return $.post(url, data);
diff --git a/assets/js/pages/categories.js b/assets/js/pages/service_categories.js
similarity index 52%
rename from assets/js/pages/categories.js
rename to assets/js/pages/service_categories.js
index 390cc60b..e2f7c2eb 100644
--- a/assets/js/pages/categories.js
+++ b/assets/js/pages/service_categories.js
@@ -10,13 +10,13 @@
* ---------------------------------------------------------------------------- */
/**
- * Categories page.
+ * Service-categories page.
*
- * This module implements the functionality of the categories page.
+ * This module implements the functionality of the service-categories page.
*/
App.Pages.Categories = (function () {
- const $categories = $('#categories');
- const $filterCategories = $('#filter-categories');
+ const $serviceCategories = $('#service-categories');
+ const $filterCategories = $('#filter-service-categories');
const $id = $('#id');
const $name = $('#name');
const $description = $('#description');
@@ -32,67 +32,67 @@ App.Pages.Categories = (function () {
*
* @param {jQuery.Event} event
*/
- $categories.on('submit', '#filter-categories form', (event) => {
+ $serviceCategories.on('submit', '#filter-service-categories form', (event) => {
event.preventDefault();
- const key = $('#filter-categories .key').val();
+ const key = $('#filter-service-categories .key').val();
$('.selected').removeClass('selected');
resetForm();
filter(key);
});
/**
- * Event: Filter Categories Row "Click"
+ * Event: Filter Service-Categories Row "Click"
*
* Displays the selected row data on the right side of the page.
*
* @param {jQuery.Event} event
*/
- $categories.on('click', '.category-row', (event) => {
- if ($('#filter-categories .filter').prop('disabled')) {
- $('#filter-categories .results').css('color', '#AAA');
+ $serviceCategories.on('click', '.service-category-row', (event) => {
+ if ($('#filter-service-categories .filter').prop('disabled')) {
+ $('#filter-service-categories .results').css('color', '#AAA');
return; // exit because we are on edit mode
}
- const categoryId = $(event.currentTarget).attr('data-id');
+ const serviceCategoryId = $(event.currentTarget).attr('data-id');
- const category = filterResults.find((filterResult) => Number(filterResult.id) === Number(categoryId));
+ const serviceCategory = filterResults.find((filterResult) => Number(filterResult.id) === Number(serviceCategoryId));
- display(category);
- $('#filter-categories .selected').removeClass('selected');
+ display(serviceCategory);
+ $('#filter-service-categories .selected').removeClass('selected');
$(event.currentTarget).addClass('selected');
- $('#edit-category, #delete-category').prop('disabled', false);
+ $('#edit-service-category, #delete-service-category').prop('disabled', false);
});
/**
- * Event: Add Category Button "Click"
+ * Event: Add Service-Category Button "Click"
*/
- $categories.on('click', '#add-category', () => {
+ $serviceCategories.on('click', '#add-service-category', () => {
resetForm();
- $categories.find('.add-edit-delete-group').hide();
- $categories.find('.save-cancel-group').show();
- $categories.find('.record-details').find('input, select, textarea').prop('disabled', false);
- $categories.find('.record-details .form-label span').prop('hidden', false);
+ $serviceCategories.find('.add-edit-delete-group').hide();
+ $serviceCategories.find('.save-cancel-group').show();
+ $serviceCategories.find('.record-details').find('input, select, textarea').prop('disabled', false);
+ $serviceCategories.find('.record-details .form-label span').prop('hidden', false);
$filterCategories.find('button').prop('disabled', true);
$filterCategories.find('.results').css('color', '#AAA');
});
/**
- * Event: Edit Category Button "Click"
+ * Event: Edit Service-Category Button "Click"
*/
- $categories.on('click', '#edit-category', () => {
- $categories.find('.add-edit-delete-group').hide();
- $categories.find('.save-cancel-group').show();
- $categories.find('.record-details').find('input, select, textarea').prop('disabled', false);
- $categories.find('.record-details .form-label span').prop('hidden', false);
+ $serviceCategories.on('click', '#edit-service-category', () => {
+ $serviceCategories.find('.add-edit-delete-group').hide();
+ $serviceCategories.find('.save-cancel-group').show();
+ $serviceCategories.find('.record-details').find('input, select, textarea').prop('disabled', false);
+ $serviceCategories.find('.record-details .form-label span').prop('hidden', false);
$filterCategories.find('button').prop('disabled', true);
$filterCategories.find('.results').css('color', '#AAA');
});
/**
- * Event: Delete Category Button "Click"
+ * Event: Delete Service-Category Button "Click"
*/
- $categories.on('click', '#delete-category', () => {
- const categoryId = $id.val();
+ $serviceCategories.on('click', '#delete-service-category', () => {
+ const serviceCategoryId = $id.val();
const buttons = [
{
@@ -104,7 +104,7 @@ App.Pages.Categories = (function () {
{
text: lang('delete'),
click: (event, messageModal) => {
- remove(categoryId);
+ remove(serviceCategoryId);
messageModal.dispose();
}
}
@@ -116,27 +116,27 @@ App.Pages.Categories = (function () {
/**
* Event: Categories Save Button "Click"
*/
- $categories.on('click', '#save-category', () => {
- const category = {
+ $serviceCategories.on('click', '#save-service-category', () => {
+ const serviceCategory = {
name: $name.val(),
description: $description.val()
};
if ($id.val() !== '') {
- category.id = $id.val();
+ serviceCategory.id = $id.val();
}
if (!validate()) {
return;
}
- save(category);
+ save(serviceCategory);
});
/**
- * Event: Cancel Category Button "Click"
+ * Event: Cancel Service-Category Button "Click"
*/
- $categories.on('click', '#cancel-category', () => {
+ $serviceCategories.on('click', '#cancel-service-category', () => {
const id = $id.val();
resetForm();
if (id !== '') {
@@ -148,23 +148,23 @@ App.Pages.Categories = (function () {
/**
* Filter service categories records.
*
- * @param {String} keyword This key string is used to filter the category records.
+ * @param {String} keyword This key string is used to filter the service-category records.
* @param {Number} selectId Optional, if set then after the filter operation the record with the given
* ID will be selected (but not displayed).
* @param {Boolean} show Optional (false), if true then the selected record will be displayed on the form.
*/
function filter(keyword, selectId = null, show = false) {
- App.Http.Categories.search(keyword, filterLimit).then((response) => {
+ App.Http.ServiceCategories.search(keyword, filterLimit).then((response) => {
filterResults = response;
- $('#filter-categories .results').empty();
+ $('#filter-service-categories .results').empty();
- response.forEach((category) => {
- $('#filter-categories .results').append(getFilterHtml(category)).append($('
'));
+ response.forEach((serviceCategory) => {
+ $('#filter-service-categories .results').append(getFilterHtml(serviceCategory)).append($('
'));
});
if (response.length === 0) {
- $('#filter-categories .results').append(
+ $('#filter-service-categories .results').append(
$('
', {
'text': lang('no_records_found')
})
@@ -178,7 +178,7 @@ App.Pages.Categories = (function () {
filterLimit += 20;
filter(keyword, selectId, show);
}
- }).appendTo('#filter-categories .results');
+ }).appendTo('#filter-service-categories .results');
}
if (selectId) {
@@ -188,13 +188,13 @@ App.Pages.Categories = (function () {
}
/**
- * Save a category record to the database (via AJAX post).
+ * Save a service-category record to the database (via AJAX post).
*
- * @param {Object} category Contains the category data.
+ * @param {Object} serviceCategory Contains the service-category data.
*/
- function save(category) {
- App.Http.Categories.save(category).then((response) => {
- App.Layouts.Backend.displayNotification(lang('category_saved'));
+ function save(serviceCategory) {
+ App.Http.ServiceCategories.save(serviceCategory).then((response) => {
+ App.Layouts.Backend.displayNotification(lang('service_category_saved'));
resetForm();
$filterCategories.find('.key').val('');
filter('', response.id, true);
@@ -202,42 +202,42 @@ App.Pages.Categories = (function () {
}
/**
- * Delete category record.
+ * Delete service-category record.
*
* @param {Number} id Record ID to be deleted.
*/
function remove(id) {
- App.Http.Categories.destroy(id).then(() => {
+ App.Http.ServiceCategories.destroy(id).then(() => {
App.Layouts.Backend.displayNotification(lang('category_deleted'));
resetForm();
- filter($('#filter-categories .key').val());
+ filter($('#filter-service-categories .key').val());
});
}
/**
- * Display a category record on the form.
+ * Display a service-category record on the form.
*
- * @param {Object} category Contains the category data.
+ * @param {Object} serviceCategory Contains the service-category data.
*/
- function display(category) {
- $id.val(category.id);
- $name.val(category.name);
- $description.val(category.description);
+ function display(serviceCategory) {
+ $id.val(serviceCategory.id);
+ $name.val(serviceCategory.name);
+ $description.val(serviceCategory.description);
}
/**
- * Validate category data before save (insert or update).
+ * Validate service-category data before save (insert or update).
*
* @return {Boolean} Returns the validation result.
*/
function validate() {
- $categories.find('.is-invalid').removeClass('is-invalid');
- $categories.find('.form-message').removeClass('alert-danger').hide();
+ $serviceCategories.find('.is-invalid').removeClass('is-invalid');
+ $serviceCategories.find('.form-message').removeClass('alert-danger').hide();
try {
let missingRequired = false;
- $categories.find('.required').each((index, fieldEl) => {
+ $serviceCategories.find('.required').each((index, fieldEl) => {
if (!$(fieldEl).val()) {
$(fieldEl).addClass('is-invalid');
missingRequired = true;
@@ -250,43 +250,43 @@ App.Pages.Categories = (function () {
return true;
} catch (error) {
- $categories.find('.form-message').addClass('alert-danger').text(error.message).show();
+ $serviceCategories.find('.form-message').addClass('alert-danger').text(error.message).show();
return false;
}
}
/**
- * Bring the category form back to its initial state.
+ * Bring the service-category form back to its initial state.
*/
function resetForm() {
$filterCategories.find('.selected').removeClass('selected');
$filterCategories.find('button').prop('disabled', false);
$filterCategories.find('.results').css('color', '');
- $categories.find('.add-edit-delete-group').show();
- $categories.find('.save-cancel-group').hide();
- $categories.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
- $categories.find('.record-details .form-label span').prop('hidden', true);
- $('#edit-category, #delete-category').prop('disabled', true);
+ $serviceCategories.find('.add-edit-delete-group').show();
+ $serviceCategories.find('.save-cancel-group').hide();
+ $serviceCategories.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
+ $serviceCategories.find('.record-details .form-label span').prop('hidden', true);
+ $('#edit-service-category, #delete-service-category').prop('disabled', true);
- $categories.find('.record-details .is-invalid').removeClass('is-invalid');
- $categories.find('.record-details .form-message').hide();
+ $serviceCategories.find('.record-details .is-invalid').removeClass('is-invalid');
+ $serviceCategories.find('.record-details .form-message').hide();
}
/**
* Get the filter results row HTML code.
*
- * @param {Object} category Contains the category data.
+ * @param {Object} serviceCategory Contains the service-category data.
*
* @return {String} Returns the record HTML code.
*/
- function getFilterHtml(category) {
+ function getFilterHtml(serviceCategory) {
return $('
', {
- 'class': 'category-row entry',
- 'data-id': category.id,
+ 'class': 'service-category-row entry',
+ 'data-id': serviceCategory.id,
'html': [
$('
', {
- 'text': category.name
+ 'text': serviceCategory.name
}),
$('
')
]
@@ -296,7 +296,7 @@ App.Pages.Categories = (function () {
/**
* Select a specific record from the current filter results.
*
- * If the category ID does not exist in the list then no record will be selected.
+ * If the service-category ID does not exist in the list then no record will be selected.
*
* @param {Number} id The record ID to be selected from the filter results.
* @param {Boolean} show Optional (false), if true then the method will display the record on the form.
@@ -304,14 +304,14 @@ App.Pages.Categories = (function () {
function select(id, show = false) {
$filterCategories.find('.selected').removeClass('selected');
- $filterCategories.find('.category-row[data-id="' + id + '"]').addClass('selected');
+ $filterCategories.find('.service-category-row[data-id="' + id + '"]').addClass('selected');
if (show) {
- const category = filterResults.find((category) => Number(category.id) === Number(id));
+ const serviceCategory = filterResults.find((serviceCategory) => Number(serviceCategory.id) === Number(id));
- display(category);
+ display(serviceCategory);
- $('#edit-category, #delete-category').prop('disabled', false);
+ $('#edit-service-category, #delete-service-category').prop('disabled', false);
}
}
diff --git a/assets/js/pages/services.js b/assets/js/pages/services.js
index acc74765..3d4cd534 100644
--- a/assets/js/pages/services.js
+++ b/assets/js/pages/services.js
@@ -21,7 +21,7 @@ App.Pages.Services = (function () {
const $duration = $('#duration');
const $price = $('#price');
const $currency = $('#currency');
- const $category = $('#category');
+ const $serviceCategoryId = $('#service-category-id');
const $availabilitiesType = $('#availabilities-type');
const $attendantsNumber = $('#attendants-number');
const $isPrivate = $('#is-private');
@@ -107,7 +107,7 @@ App.Pages.Services = (function () {
$duration.val('30');
$price.val('0');
$currency.val('');
- $category.val('');
+ $serviceCategoryId.val('');
$availabilitiesType.val('flexible');
$attendantsNumber.val('1');
});
@@ -142,7 +142,7 @@ App.Pages.Services = (function () {
availabilities_type: $availabilitiesType.val(),
attendants_number: $attendantsNumber.val(),
is_private: Number($isPrivate.prop('checked')),
- id_categories: $category.val() || undefined
+ id_service_categories: $serviceCategoryId.val() || undefined
};
if ($id.val() !== '') {
@@ -300,8 +300,8 @@ App.Pages.Services = (function () {
$isPrivate.prop('checked', service.is_private);
App.Components.ColorSelection.setColor($color, service.color);
- const categoryId = service.id_categories !== null ? service.id_categories : '';
- $category.val(categoryId);
+ const serviceCategoryId = service.id_service_categories !== null ? service.id_service_categories : '';
+ $serviceCategoryId.val(serviceCategoryId);
}
/**
@@ -399,19 +399,19 @@ App.Pages.Services = (function () {
}
/**
- * Update the service category list box.
+ * Update the service-category list box.
*
* Use this method every time a change is made to the service categories db table.
*/
- function updateAvailableCategories() {
- App.Http.Categories.search('', 999).then((response) => {
- $category.empty();
+ function updateAvailableServiceCategories() {
+ App.Http.ServiceCategories.search('', 999).then((response) => {
+ $serviceCategoryId.empty();
- response.forEach((category) => {
- $category.append(new Option(category.name, category.id));
+ response.forEach((serviceCategory) => {
+ $serviceCategoryId.append(new Option(serviceCategory.name, serviceCategory.id));
});
- $category.append(new Option('', '')).val('');
+ $serviceCategoryId.append(new Option('', '')).val('');
});
}
@@ -422,7 +422,7 @@ App.Pages.Services = (function () {
resetForm();
filter('');
addEventListeners();
- updateAvailableCategories();
+ updateAvailableServiceCategories();
}
document.addEventListener('DOMContentLoaded', initialize);
diff --git a/openapi.yml b/openapi.yml
index 330ef8a3..284ed689 100644
--- a/openapi.yml
+++ b/openapi.yml
@@ -21,10 +21,10 @@ tags:
- name: admins
- name: appointments
- name: availabilities
- - name: categories
- name: customers
- name: providers
- name: secretaries
+ - name: service_categories
- name: services
- name: settings
- name: unavailabilities
@@ -776,11 +776,11 @@ paths:
security:
- BearerToken: [ ]
- BasicAuth: [ ]
- /categories:
+ /service_categories:
get:
tags:
- - categories
- summary: Get all categories
+ - service_categories
+ summary: Get all service-categories
parameters:
- name: page
in: query
@@ -812,7 +812,7 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/CategoryCollection'
+ $ref: '#/components/schemas/ServiceCategoryCollection'
'401':
description: Unauthorized
'500':
@@ -826,13 +826,13 @@ paths:
- BasicAuth: [ ]
post:
tags:
- - categories
- summary: Create a category
+ - service_categories
+ summary: Create a service-category
requestBody:
content:
application/json:
schema:
- $ref: '#/components/schemas/CategoryPayload'
+ $ref: '#/components/schemas/ServiceCategoryPayload'
required: true
responses:
'201':
@@ -840,7 +840,7 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/CategoryRecord'
+ $ref: '#/components/schemas/ServiceCategoryRecord'
'401':
description: Unauthorized
'500':
@@ -853,13 +853,13 @@ paths:
security:
- BearerToken: [ ]
- BasicAuth: [ ]
- /categories/{categoryId}:
+ /service_categories/{serviceCategoryId}:
get:
tags:
- - categories
- summary: Get a category
+ - service_categories
+ summary: Get a service-category
parameters:
- - name: categoryId
+ - name: serviceCategoryId
in: path
required: true
schema:
@@ -870,7 +870,7 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/CategoryRecord'
+ $ref: '#/components/schemas/ServiceCategoryRecord'
'401':
description: Unauthorized
'404':
@@ -886,10 +886,10 @@ paths:
- BasicAuth: [ ]
put:
tags:
- - categories
- summary: Update a category
+ - service_categories
+ summary: Update a service-category
parameters:
- - name: categoryId
+ - name: serviceCategoryId
in: path
required: true
schema:
@@ -898,7 +898,7 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/CategoryPayload'
+ $ref: '#/components/schemas/ServiceCategoryPayload'
required: true
responses:
'200':
@@ -906,7 +906,7 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/CategoryRecord'
+ $ref: '#/components/schemas/ServiceCategoryRecord'
'401':
description: Unauthorized
'404':
@@ -923,10 +923,10 @@ paths:
- BasicAuth: [ ]
delete:
tags:
- - categories
- summary: Delete a category
+ - service_categories
+ summary: Delete a service-category
parameters:
- - name: categoryId
+ - name: serviceCategoryId
in: path
required: true
schema:
@@ -1986,7 +1986,7 @@ components:
description: This is a test service.
availabilitiesType: flexible
attendantsNumber: 1
- categoryId: null
+ serviceCategoryId: null
ServicePayload:
type: object
properties:
@@ -2006,7 +2006,7 @@ components:
type: string
attendantsNumber:
type: integer
- categoryId:
+ serviceCategoryId:
type: integer
example:
name: Test Service
@@ -2017,12 +2017,12 @@ components:
description: This is a test service.
availabilitiesType: flexible
attendantsNumber: 1
- categoryId: null
+ serviceCategoryId: null
ServiceCollection:
type: array
items:
$ref: '#/components/schemas/ServiceRecord'
- CategoryRecord:
+ ServiceCategoryRecord:
type: object
properties:
id:
@@ -2035,7 +2035,7 @@ components:
id: 1
name: Test Category
description: This is a test category.
- CategoryPayload:
+ ServiceCategoryPayload:
type: object
properties:
name:
@@ -2045,10 +2045,10 @@ components:
example:
name: Test Category
description: This is a test category.
- CategoryCollection:
+ ServiceCategoryCollection:
type: array
items:
- $ref: '#/components/schemas/CategoryRecord'
+ $ref: '#/components/schemas/ServiceCategoryRecord'
AdminRecord:
type: object
properties: