permissions

This commit is contained in:
Shohrat 2023-11-20 00:59:08 +05:00
parent b321aad179
commit 69bc178a0f
90 changed files with 17987 additions and 39681 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,18 @@
<?php namespace RainLab\User\Controllers;
use Backend\Classes\Controller;
use BackendMenu;
class Permissions extends Controller
{
public $implement = [ 'Backend\Behaviors\ListController', 'Backend\Behaviors\FormController' ];
public $listConfig = 'config_list.yaml';
public $formConfig = 'config_form.yaml';
public function __construct()
{
parent::__construct();
BackendMenu::setContext('RainLab.User', 'user', 'permissions');
}
}

View File

@ -48,6 +48,7 @@ class User extends UserBase
]
];
protected $jsonable = ['permission2'];
/**
* @var array The attributes that are mass assignable.
*/

View File

@ -1,95 +1,122 @@
# ===================================
# Field Definitions
# ===================================
fields:
name:
label: rainlab.user::lang.user.name
label: 'rainlab.user::lang.user.name'
span: auto
type: text
surname:
label: rainlab.user::lang.user.surname
label: 'rainlab.user::lang.user.surname'
span: auto
type: text
tabs:
fields:
email:
label: rainlab.user::lang.user.email
tab: rainlab.user::lang.user.account
label: 'rainlab.user::lang.user.email'
tab: 'rainlab.user::lang.user.account'
span: full
type: text
send_invite:
type: checkbox
label: rainlab.user::lang.user.send_invite
comment: rainlab.user::lang.user.send_invite_comment
tab: rainlab.user::lang.user.account
label: 'rainlab.user::lang.user.send_invite'
comment: 'rainlab.user::lang.user.send_invite_comment'
tab: 'rainlab.user::lang.user.account'
default: true
context: create
block_mail:
label: rainlab.user::lang.user.block_mail
tab: rainlab.user::lang.user.account
label: 'rainlab.user::lang.user.block_mail'
tab: 'rainlab.user::lang.user.account'
type: checkbox
span: full
cssClass: field-align-above
context: update
password@create:
label: rainlab.user::lang.user.create_password
comment: rainlab.user::lang.user.create_password_comment
tab: rainlab.user::lang.user.account
label: 'rainlab.user::lang.user.create_password'
comment: 'rainlab.user::lang.user.create_password_comment'
tab: 'rainlab.user::lang.user.account'
type: password
span: left
password@update:
label: rainlab.user::lang.user.reset_password
comment: rainlab.user::lang.user.reset_password_comment
tab: rainlab.user::lang.user.account
label: 'rainlab.user::lang.user.reset_password'
comment: 'rainlab.user::lang.user.reset_password_comment'
tab: 'rainlab.user::lang.user.account'
type: password
span: left
password_confirmation:
label: rainlab.user::lang.user.confirm_password
comment: rainlab.user::lang.user.confirm_password_comment
tab: rainlab.user::lang.user.account
label: 'rainlab.user::lang.user.confirm_password'
comment: 'rainlab.user::lang.user.confirm_password_comment'
tab: 'rainlab.user::lang.user.account'
type: password
span: right
context: [create, update]
context:
- create
- update
username:
label: rainlab.user::lang.user.username
tab: rainlab.user::lang.user.account
label: 'rainlab.user::lang.user.username'
tab: 'rainlab.user::lang.user.account'
hidden: true
span: left
type: text
groups:
label: rainlab.user::lang.user.groups
tab: rainlab.user::lang.user.account
label: 'rainlab.user::lang.user.groups'
nameFrom: name
descriptionFrom: description
emptyOption: 'rainlab.user::lang.user.empty_groups'
span: full
type: relation
emptyOption: rainlab.user::lang.user.empty_groups
tab: 'rainlab.user::lang.user.account'
created_ip_address:
label: rainlab.user::lang.user.created_ip_address
label: 'rainlab.user::lang.user.created_ip_address'
span: auto
disabled: true
tab: rainlab.user::lang.user.account
tab: 'rainlab.user::lang.user.account'
context: preview
type: text
last_ip_address:
label: rainlab.user::lang.user.last_ip_address
label: 'rainlab.user::lang.user.last_ip_address'
span: auto
disabled: true
tab: rainlab.user::lang.user.account
tab: 'rainlab.user::lang.user.account'
context: preview
type: text
permission2:
label: Rugsatlar
prompt: 'Add new item'
style: default
span: auto
type: repeater
tab: Rugsatlar
form:
fields:
code:
label: Kody
options:
producedStocks: 'Öndürlen önüm skladlary'
dashboard: 'Baş sahypa'
bagActions: 'Halta hereketleri'
acceptAccountant: 'Bugalter Tassyklama'
acceptDirector: 'Direktor Tassyklama'
rulonActions: 'Rulon hereketleri'
rawStocks: 'Çig mal sklad'
rawActions: 'Çig mal hereketleri'
extrudorProduction: Ekstrudorlar
crudExtrudor: 'Ekstrudor hasabat dolandyrmak'
productionRulon: 'Rulon önümçilik'
crudProductionRulon: 'Rulon önümçilik dolandyrmak'
inboxProductionRulon: 'Rulony sklada salmak'
sewerProduction: Tikinçiler
crudSewerProduction: 'Tikinçiler dolandyrmak'
orders: Sargytlar
crudOrders: 'Sargytlar dolandyrmak'
journal: Žurnal
emptyOption: Sayla
showSearch: true
span: full
type: dropdown
secondaryTabs:
fields:
avatar:
label: rainlab.user::lang.user.avatar
label: 'rainlab.user::lang.user.avatar'
type: fileupload
mode: image
imageHeight: 260
imageWidth: 260
tab: Misc

View File

@ -0,0 +1,25 @@
<?php namespace RainLab\User\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class UsersAddPermission2 extends Migration
{
public function up()
{
Schema::table('users', function($table)
{
$table->text('permission2')->default('[{"code":"producedStocks"},{"code":"bagActions"},{"code":"acceptAccountant"},{"code":"acceptDirector"},{"code":"rulonActions"},{"code":"rawStocks"},{"code":"rawActions"},{"code":"crudRawActions"},{"code":"extrudorProduction"},{"code":"crudRawActions"},{"code":"extrudorProduction"},{"code":"crudExtrudor"},{"code":"productionRulon"},{"code":"crudProductionRulon"},{"code":"inboxProductionRulon"},{"code":"sewerProduction"},{"code":"crudSewerProduction"},{"code":"orders"},{"code":"crudOrders"}]')->nullable();
});
}
public function down()
{
if (Schema::hasColumn('users', 'permission2')) {
Schema::table('users', function($table)
{
$table->dropColumn('permission2');
});
}
}
}

View File

@ -1,85 +1,91 @@
v1.0.1:
- Initialize plugin.
1.0.1:
- 'Initialize plugin.'
- create_users_table.php
- create_throttle_table.php
v1.0.2: Seed tables.
v1.0.3: Translated hard-coded text to language strings.
v1.0.4: Improvements to user-interface for Location manager.
v1.0.5: Added contact details for users.
v1.0.6:
- Added Mail Blocker utility so users can block specific mail templates.
1.0.2: 'Seed tables.'
1.0.3: 'Translated hard-coded text to language strings.'
1.0.4: 'Improvements to user-interface for Location manager.'
1.0.5: 'Added contact details for users.'
1.0.6:
- 'Added Mail Blocker utility so users can block specific mail templates.'
- create_mail_blockers_table.php
v1.0.7: Add back-end Settings page.
v1.0.8: Updated the Settings page.
v1.0.9: Adds new welcome mail message for users and administrators.
v1.0.10: Adds administrator-only activation mode.
v1.0.11:
- Users now have an optional login field that defaults to the email field.
1.0.7: 'Add back-end Settings page.'
1.0.8: 'Updated the Settings page.'
1.0.9: 'Adds new welcome mail message for users and administrators.'
1.0.10: 'Adds administrator-only activation mode.'
1.0.11:
- 'Users now have an optional login field that defaults to the email field.'
- users_add_login_column.php
v1.0.12:
- Create a dedicated setting for choosing the login mode.
1.0.12:
- 'Create a dedicated setting for choosing the login mode.'
- users_rename_login_to_username.php
v1.0.13: Minor fix to the Account sign in logic.
v1.0.14: Minor improvements to the code.
v1.0.15:
- Adds last name column to users table (surname).
1.0.13: 'Minor fix to the Account sign in logic.'
1.0.14: 'Minor improvements to the code.'
1.0.15:
- 'Adds last name column to users table (surname).'
- users_add_surname.php
v1.0.16: Require permissions for settings page too.
v1.1.0: Profile fields and Locations have been removed.
v1.1.1:
- Users can now be added to groups.
1.0.16: 'Require permissions for settings page too.'
1.1.0: 'Profile fields and Locations have been removed.'
1.1.1:
- 'Users can now be added to groups.'
- create_user_groups_table.php
- seed_user_groups_table.php
v1.1.2: A raw URL can now be passed as the redirect property in the Account component.
v1.1.3: Adds a super user flag to the users table, reserved for future use.
v1.1.4: User list can be filtered by the group they belong to.
v1.1.5: Adds a new permission to hide the User settings menu item.
v1.2.0:
- Users can now deactivate their own accounts.
1.1.2: 'A raw URL can now be passed as the redirect property in the Account component.'
1.1.3: 'Adds a super user flag to the users table, reserved for future use.'
1.1.4: 'User list can be filtered by the group they belong to.'
1.1.5: 'Adds a new permission to hide the User settings menu item.'
1.2.0:
- 'Users can now deactivate their own accounts.'
- users_add_deleted_at.php
v1.2.1: New feature for checking if a user is recently active/online.
v1.2.2: Add bulk action button to user list.
v1.2.3: Included some descriptive paragraphs in the Reset Password component markup.
v1.2.4: Added a checkbox for blocking all mail sent to the user.
v1.2.5:
- Database maintenance. Updated all timestamp columns to be nullable.
1.2.1: 'New feature for checking if a user is recently active/online.'
1.2.2: 'Add bulk action button to user list.'
1.2.3: 'Included some descriptive paragraphs in the Reset Password component markup.'
1.2.4: 'Added a checkbox for blocking all mail sent to the user.'
1.2.5:
- 'Database maintenance. Updated all timestamp columns to be nullable.'
- update_timestamp_nullable.php
v1.2.6:
- Add a dedicated last seen column for users.
1.2.6:
- 'Add a dedicated last seen column for users.'
- users_add_last_seen.php
v1.2.7: Minor fix to user timestamp attributes.
v1.2.8: Add date range filter to users list. Introduced a logout event.
v1.2.9: Add invitation mail for new accounts created in the back-end.
v1.3.0:
- Introduced guest user accounts.
1.2.7: 'Minor fix to user timestamp attributes.'
1.2.8: 'Add date range filter to users list. Introduced a logout event.'
1.2.9: 'Add invitation mail for new accounts created in the back-end.'
1.3.0:
- 'Introduced guest user accounts.'
- users_add_guest_flag.php
- users_add_superuser_flag.php
v1.3.1: User notification variables can now be extended.
v1.3.2: Minor fix to the Auth::register method.
v1.3.3: Allow prevention of concurrent user sessions via the user settings.
v1.3.4: Added force secure protocol property to the account component.
v1.4.0: The Notifications tab in User settings has been removed.
v1.4.1: Added support for user impersonation.
v1.4.2: Fixes security bug in Password Reset component.
v1.4.3: Fixes session handling for AJAX requests.
v1.4.4: Fixes bug where impersonation touches the last seen timestamp.
v1.4.5: Added token fallback process to Account / Reset Password components when parameter is missing.
v1.4.6: Fixes Auth::register method signature mismatch with core October CMS Auth library
v1.4.7: Fixes redirect bug in Account component / Update translations and separate user and group management.
v1.4.8: Fixes a bug where calling MailBlocker::removeBlock could remove all mail blocks for the user.
v1.5.0: Required password length is now a minimum of 8 characters. Previous passwords will not be affected until the next password change.
v1.5.1:
- User IP addresses are now logged. Introduce registration throttle.
1.3.1: 'User notification variables can now be extended.'
1.3.2: 'Minor fix to the Auth::register method.'
1.3.3: 'Allow prevention of concurrent user sessions via the user settings.'
1.3.4: 'Added force secure protocol property to the account component.'
1.4.0: 'The Notifications tab in User settings has been removed.'
1.4.1: 'Added support for user impersonation.'
1.4.2: 'Fixes security bug in Password Reset component.'
1.4.3: 'Fixes session handling for AJAX requests.'
1.4.4: 'Fixes bug where impersonation touches the last seen timestamp.'
1.4.5: 'Added token fallback process to Account / Reset Password components when parameter is missing.'
1.4.6: 'Fixes Auth::register method signature mismatch with core October CMS Auth library'
1.4.7: 'Fixes redirect bug in Account component / Update translations and separate user and group management.'
1.4.8: 'Fixes a bug where calling MailBlocker::removeBlock could remove all mail blocks for the user.'
1.5.0: 'Required password length is now a minimum of 8 characters. Previous passwords will not be affected until the next password change.'
1.5.1:
- 'User IP addresses are now logged. Introduce registration throttle.'
- users_add_ip_address.php
v1.5.2: Whitespace from usernames is now trimmed, allowed for username to be added to Reset Password mail templates.
v1.5.3: Fixes a bug in the user update functionality if password is not changed. Added highlighting for banned users in user list.
v1.5.4: Multiple translation improvements. Added view events to extend user preview and user listing toolbars.
v1.5.5: Updated settings icon and description.
v1.6.0: Apply persistence settings on activation and registration. Fixes last seen touched when impersonating. Fixes user suspension not clearing.
v1.6.1: Adds component property for resetPage in ResetPassword component.
v1.6.2: Improve support with October v3
v1.6.3: Fixes mail blocker logic
v1.6.4: Fixes bulk action button with October v3
v1.7.0: Add password policy
v1.7.1: Fixes compatibility with legacy sites
v1.7.2: Stability fixes
1.5.2: 'Whitespace from usernames is now trimmed, allowed for username to be added to Reset Password mail templates.'
1.5.3: 'Fixes a bug in the user update functionality if password is not changed. Added highlighting for banned users in user list.'
1.5.4: 'Multiple translation improvements. Added view events to extend user preview and user listing toolbars.'
1.5.5: 'Updated settings icon and description.'
1.6.0: 'Apply persistence settings on activation and registration. Fixes last seen touched when impersonating. Fixes user suspension not clearing.'
1.6.1: 'Adds component property for resetPage in ResetPassword component.'
1.6.2: 'Improve support with October v3'
1.6.3: 'Fixes mail blocker logic'
1.6.4: 'Fixes bulk action button with October v3'
1.7.0: 'Add password policy'
1.7.1: 'Fixes compatibility with legacy sites'
1.7.2: 'Stability fixes'
1.7.3:
- 'Created table rainlab_user_permissions'
- builder_table_create_rainlab_user_permissions.php
1.7.4:
- 'Created table rainlab_user_permissions2'
- users_add_permission2.php

View File

@ -279,7 +279,7 @@ class MachineProduction extends ComponentBase
public function onReport()
{
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');
$data = post();

View File

@ -32,7 +32,7 @@ class Order extends ComponentBase
public function onReportOrder()
{
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');
$data = post();
@ -135,7 +135,7 @@ class Order extends ComponentBase
public function onReportLogistics()
{
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');
$data = post();
@ -1175,7 +1175,7 @@ class Order extends ComponentBase
public function onCreateOrder()
{
$user = \Auth::user();
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');

View File

@ -33,7 +33,7 @@ class Production extends ComponentBase
public function onReportProduction()
{
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');
$data = post();
@ -157,7 +157,7 @@ class Production extends ComponentBase
public function onCalculateReportDaily()
{
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');
@ -180,8 +180,9 @@ class Production extends ComponentBase
$products = ProductModel::where('report', 'simple')->get();
// dd(count($countDailyChanges));
$dailyCalculated = ProductionCalculateModel::whereDate("date", date($currentDateFormat))->where("excruiter_id", $excruiter)->sum("amount_calc");
if (count($countDailyChanges) > 1) {
if ((count($countDailyChanges) > 0) && ($dailyCalculated)) {
$dailyCalculated = ProductionCalculateModel::whereDate("date", date($currentDateFormat))->where("excruiter_id", $excruiter)->sum("amount_calc");
@ -190,9 +191,9 @@ class Production extends ComponentBase
// gunluk hasabat
$html_data = '<div class="row">';
$html_data .= '<h4 style="margin-top: 20px;margin-bottom: 20px;">JEMI IŞLENEN ÇIG MAL (ekskruiter: ' . $currentExcrutier->name . ')</h4>';
$html_data .= '<h4 style="margin-top: 20px;margin-bottom: 20px;">JEMI IŞLENEN ÇIG MAL (ekstrudor: ' . $currentExcrutier->name . ')</h4>';
$html_data .= '<div class="col-lg">
$html_data .= '<div class="col-md-2">
<a class="card bg-success text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white"><i
@ -206,9 +207,9 @@ class Production extends ComponentBase
//sagatda ortacaha hasaplama
$html_data2 .= '<div class="row">';
$html_data2 .= '<h4 style="margin-top: 20px;margin-bottom: 20px;">SAGATDA ORTAÇA (ekskruiter: ' . $currentExcrutier->name . ')</h4>';
$html_data2 .= '<h4 style="margin-top: 20px;margin-bottom: 20px;">SAGATDA ORTAÇA (ekstrudor: ' . $currentExcrutier->name . ')</h4>';
$html_data2 .= '<div class="col-lg">
$html_data2 .= '<div class="col-md-2">
<a class="card bg-success text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white"><i
@ -228,23 +229,23 @@ class Production extends ComponentBase
// $diff = $pivotLasts[$x]->amount - $pivotFirsts[$x]->amount;
// $diffPerc = ($diff * 100) / $producedAll;
$html_data .= '<div class="col-lg">
$html_data .= '<div class="col-md-2">
<a class="card bg-info text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white"><i class="mdi mdi-bullseye-arrow me-3"></i>' . ($productCalc) . ' kg</h5>
<h5 class="mb-4 text-white"><i class="mdi mdi-bullseye-arrow me-3"></i>' . (number_format($productCalc, 2)) . ' kg</h5>
<hr>
<p class="card-text" style="font-size: 15px;color: white;">' . $products[$x]->name . ' : ' . ($productCalcPercentage->amount_percentage) . ' %</p>
<p class="card-text" style="font-size: 15px;color: white;">' . $products[$x]->code . ' : ' . ($productCalcPercentage->amount_percentage) . ' %</p>
</div>
</a>
</div>';
$html_data2 .= '<div class="col-lg">
$html_data2 .= '<div class="col-md-2">
<a class="card bg-info text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white"><i class="mdi mdi-bullseye-arrow me-3"></i>' . number_format($productCalc / floor($diffMinutes / 60), 2) . ' kg</h5>
<hr>
<p class="card-text" style="font-size: 15px;color: white;">' . $products[$x]->name . ' : ' . ($productCalcPercentage->amount_percentage) . ' %</p>
<p class="card-text" style="font-size: 15px;color: white;">' . $products[$x]->code . ' : ' . ($productCalcPercentage->amount_percentage) . ' %</p>
</div>
</a>
</div>';
@ -273,15 +274,15 @@ class Production extends ComponentBase
$productCalc = ProductionCalculateModel::whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiters[$x]->id)->sum('amount_calc');
$html_data3 .= '<h4 style="margin-top: 20px;margin-bottom: 20px;">JEMI IŞLENEN ÇIG MAL (ekskruiter: ' . $excruiters[$x]->name . ')</h4>';
$html_data3 .= '<h4 style="margin-top: 20px;margin-bottom: 20px;">JEMI IŞLENEN ÇIG MAL (ekstrudor: ' . $excruiters[$x]->name . ')</h4>';
$html_data3 .= '<div class="col-lg">
$html_data3 .= '<div class="col-md-2">
<a class="card bg-success text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white"><i
class="mdi mdi-bullseye-arrow me-3"></i>' . $timeCalc . '</h5>
<hr>
<p class="card-text" style="font-size: 15px;color: white;">JEMI IŞLENEN: ' . $dailyCalculated . ' kg</p>
<p class="card-text" style="font-size: 15px;color: white;">JEMI IŞLENEN: ' . number_format($dailyCalculated, 2) . ' kg</p>
</div>
</a>
</div>';
@ -292,12 +293,12 @@ class Production extends ComponentBase
$productCalcPercentage = ProductionCalculateModel::whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiters[$x]->id)->where("product_id", $products[$i]->id)->orderBy('id', 'DESC')->first();
$html_data3 .= '<div class="col-lg">
$html_data3 .= '<div class="col-md-2">
<a class="card bg-info text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white"><i class="mdi mdi-bullseye-arrow me-3"></i>' . ($productCalc) . ' kg</h5>
<h5 class="mb-4 text-white"><i class="mdi mdi-bullseye-arrow me-3"></i>' . (number_format($productCalc, 2)) . ' kg</h5>
<hr>
<p class="card-text" style="font-size: 15px;color: white;">' . $products[$i]->name . ' : ' . ($productCalcPercentage->amount_percentage ?? 0) . ' %</p>
<p class="card-text" style="font-size: 15px;color: white;">' . $products[$i]->code . ' : ' . ($productCalcPercentage->amount_percentage ?? 0) . ' %</p>
</div>
</a>
</div>';
@ -384,12 +385,9 @@ class Production extends ComponentBase
}
function onCalculateAvg()
{
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');
$excruiter = $this->param("excruiter");
@ -400,19 +398,25 @@ class Production extends ComponentBase
$todayProductionsCount = ProductionModel::whereDate('date', date($enteredDate))->where("excruiter_id", $excruiter)->count();
if ($todayProductionsCount > 1) {
if ($todayProductionsCount > 0) {
$todayProductionsGet = ProductionModel::whereDate('date', date($enteredDate))->where("excruiter_id", $excruiter)->orderBy("id", "DESC")->first();
$productionPivot = PivotProductionModel::where('production_id', $todayProductionsGet->id)->where("product_id", $data["prod_id"])->first();
$diffAllAMount = (float) $data["all_amount"] - (float) $todayProductionsGet->all_amount;
if(!$productionPivot){
$amountPERC = 0;
}else{
$amountPERC = $productionPivot->amount_percentage;
}
$diffAllAMount = ((float) $data["all_amount"] - (float) $todayProductionsGet->all_amount) ?? 0;
$calculatedAmount = (float)(((float) $data["field_value"] ?? 0) / 100) * ((float) $diffAllAMount);
$allData = array(
"product_name" => $productionPivot->product_name,
"avg_percentage" => number_format($productionPivot->amount_percentage, 2),
"product_name" => $productionPivot->product_code ?? "Haryt yok",
"avg_percentage" => number_format($amountPERC, 2),
"avg_amount" => number_format($calculatedAmount, 2),
"headerq" => "Çig Mallar Boýunça (Soňky üýtgeşme: " . $diffAllAMount . " kg)"
);
@ -424,33 +428,7 @@ class Production extends ComponentBase
);
}
// if ($sumPercentage != 0) {
// $calcAvgPerc = ($sumPercentage + (float) $data["field_value"]) / ($sumPercentageCount + 1);
// // $convertedToKgAvg = ((int) $data["field_value"] / 100) * ((int) $data["all_amount"]);
// $convertedToKgSum = ((float) $data["field_value"] / 100) * ((float) $data["all_amount"]);
// $convertToCount = $sumAmountcount + 1;
// $calculateAvgAmount = ($convertedToKgSum + $sumAmount) / $convertToCount;
// $allData = array(
// "product_name" => $product->name,
// "avg_percentage" => number_format($calcAvgPerc, 2),
// "avg_amount" => number_format($calculateAvgAmount, 2)
// );
// } else {
// $allData = array(
// "product_name" => $product->name,
// "avg_percentage" => number_format(0, 2),
// "avg_amount" => number_format(0, 2)
// );
// }
return $allData;
// dd($currentDateFormat);
}
@ -458,7 +436,7 @@ class Production extends ComponentBase
{
$user = \Auth::user();
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
// $this["currentMonth"] = $currentDate->format('m');
$data = post();
@ -495,7 +473,7 @@ class Production extends ComponentBase
{
$user = \Auth::user();
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
// $this["currentMonth"] = $currentDate->format('m');
$data = post();
@ -519,7 +497,7 @@ class Production extends ComponentBase
$products = ProductModel::where("report", "simple")->get();
for ($x = 0; $x < count($products); $x++) {
$fieldName = "product_" . $products[$x]->code;
$fieldName = "product_" . $products[$x]->id;
$createPivotProduction = new PivotProductionModel();
$createPivotProduction->production_id = $createProduction->id;

View File

@ -124,7 +124,7 @@ class Sewer extends ComponentBase
public function onUpdateSewerItem()
{
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$user = \Auth::user();
$currentDateFormat = $currentDate->format('Y-m-d');
$stock = Stock::where("type", 'rulon')->first();
@ -136,7 +136,7 @@ class Sewer extends ComponentBase
Flash::error("Tikilen halta sanyny girizin");
return Redirect::refresh();
} else {
if ($data["status"] == "complated") {
if (($data["status"] == "complated") && ($data["produced_bag_qty"] > 0)) {
$sewer = SewerModel::where("id", $data["sewer_id"])->first();
$pivotSewer = PivotSewer::where("sewer_production_id", $data["sewer_id"])->first();
@ -192,7 +192,7 @@ class Sewer extends ComponentBase
return Redirect::refresh();
}
}else{
Flash::error("Statusy Tamlaň");
Flash::error("Statusy Tamlaň ya-da halta sany girizilmedik");
return Redirect::refresh();
}
}
@ -288,7 +288,7 @@ class Sewer extends ComponentBase
public function onReportSewer()
{
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');
$data = post();
@ -430,7 +430,7 @@ class Sewer extends ComponentBase
public function onCreateSewerProduction()
{
$user = \Auth::user();
$currentDate = Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon::now();
$currentDateFormat = $currentDate->format('Y-m-d');

View File

@ -0,0 +1,26 @@
<?php namespace Romanah\Gokbakja\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableCreateRomanahGokbakjaUserPermission extends Migration
{
public function up()
{
Schema::create('romanah_gokbakja_user_permission', function($table)
{
$table->engine = 'InnoDB';
$table->increments('id')->unsigned();
$table->timestamp('created_at')->nullable();
$table->timestamp('updated_at')->nullable();
$table->timestamp('deleted_at')->nullable();
$table->string('code');
$table->string('note')->nullable();
});
}
public function down()
{
Schema::dropIfExists('romanah_gokbakja_user_permission');
}
}

View File

@ -354,3 +354,6 @@
1.0.119:
- 'Updated table romanah_gokbakja_load_transport'
- builder_table_update_romanah_gokbakja_load_transport_2.php
1.0.120:
- 'Created table romanah_gokbakja_user_permission'
- builder_table_create_romanah_gokbakja_user_permission.php

View File

@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
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
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
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

View File

@ -0,0 +1,206 @@
<?php namespace Vdomah\Roles;
use Cms\Classes\Page;
use Event;
use Backend;
use System\Classes\PluginBase;
use Vdomah\Roles\Classes\Helper;
use Vdomah\Roles\Components\Access;
use Vdomah\Roles\Models\Role as RoleModel;
use Vdomah\Roles\Models\Permission as PermissionModel;
use Vdomah\Roles\Models\Settings;
class Plugin extends PluginBase
{
public function registerComponents()
{
return [
Access::class => 'rolesAccess',
];
}
public function registerSettings()
{
return [
'config' => [
'label' => 'vdomah.roles::lang.plugin.name',
'icon' => 'oc-icon-cubes',
'description' => 'vdomah.roles::lang.plugin.description_settings',
'class' => 'Vdomah\Roles\Models\Settings',
'order' => 100,
'permissions' => [
'roles-menu-settings',
],
],
];
}
public function registerMarkupTags()
{
return [
'functions' => [
'able' => function($permission, $user = null) { return Helper::able($permission, $user); },
'isRole' => function($role_code, $user = null) { return Helper::isRole($role_code, $user); },
'roleByCode' => function($role_code, $user = null) { return Helper::roleByCode($role_code); },
]
];
}
public function boot()
{
if (!$userPlugin = Helper::getUserPlugin()) {
return;
}
$userPlugin->checkRoleIdColumnExists();
$userClass = $userPlugin->getUserClass();
$userController = $userPlugin->getUserControllerClass();
$userRoleIdColumnName = $userPlugin->getUserRoleIdColumnName();
Event::listen('backend.menu.extendItems', function($manager) use ($userPlugin) {
$menu = [];
if ($userPlugin == Helper::USER_PLUGIN_RAINLAB) {
$menu['users'] = [
'label' => 'vdomah.roles::lang.menu.users',
'icon' => 'icon-user',
'code' => 'users',
'owner' => $userPlugin->getPluginName(),
'url' => Backend::url('rainlab/user/users'),
'order' => 400,
];
}
$menu = array_merge($menu, [
'roles_h' => [
'label' => 'vdomah.roles::lang.menu.roles_h',
'icon' => 'icon-registered',
'code' => 'roles_h',
'owner' => 'Vdomah.Roles',
'url' => Backend::url('vdomah/roles/roles'),
'order' => 400
],
'permissions_h' => [
'label' => 'vdomah.roles::lang.menu.permissions_h',
'icon' => 'icon-lock',
'code' => 'permissions_h',
'owner' => 'Vdomah.Roles',
'url' => Backend::url('vdomah/roles/permissions'),
'order' => 400
],
]);
$manager->addSideMenuItems($userPlugin->getPluginName(), $userPlugin->getBackendMenuName(), $menu);
});
RoleModel::extend(function($model) use ($userClass) {
$model->hasMany['users'] = $userClass;
});
$userClass::extend(function($model) use ($userRoleIdColumnName) {
$model->belongsTo['role'] = ['Vdomah\Roles\Models\Role', 'key' => $userRoleIdColumnName,];
$model->addFillable($userRoleIdColumnName);
$model->addDynamicMethod('scopeFilterByRole', function($query, $filter) use ($model) {
return $query->whereHas('role', function($group) use ($filter) {
$group->whereIn('id', $filter);
});
});
$model->addDynamicMethod('isRole', function($code) use ($model) {
return Helper::isRole($code, $model);
});
$model->addDynamicMethod('able', function($code) use ($model) {
return Helper::able($code, $model);
});
});
$userController::extendFormFields(function($form, $model, $context) use ($userClass) {
if (!$model instanceof $userClass)
return;
if ($form->isNested)
return;
$form->addTabfields([
'role' => [
'label' => 'vdomah.roles::lang.fields.role',
'tab' => 'vdomah.roles::lang.fields.role',
'type' => 'relation',
'span' => 'auto',
'emptyOption' => 'vdomah.roles::lang.fields.empty',
],
]);
});
Event::listen('backend.list.extendColumns', function($widget) use ($userController, $userClass) {
if (!$widget->getController() instanceof $userController) {
return;
}
if (!$widget->model instanceof $userClass) {
return;
}
$widget->addColumns([
'role' => [
'label' => 'vdomah.roles::lang.fields.role',
'select' => 'name',
'relation' => 'role',
]
]);
});
}
public function register()
{
Event::listen('backend.form.extendFields', function($widget)
{
if (!$widget->model instanceof Page) return;
$widget->addFields(
[
'settings[role]' => [
'label' => 'vdomah.roles::lang.fields.role',
'type' => 'dropdown',
'tab' => 'vdomah.roles::lang.editor.access',
'options' => $this->getRoleOptions(),
'span' => 'auto'
],
'settings[permission]' => [
'label' => 'vdomah.roles::lang.fields.permission',
'type' => 'dropdown',
'tab' => 'vdomah.roles::lang.editor.access',
'options' => $this->getPermissionOptions(),
'span' => 'auto'
],
'settings[anonymous_only]' => [
'label' => 'vdomah.roles::lang.fields.anonymous_only',
'type' => 'checkbox',
'tab' => 'vdomah.roles::lang.editor.access',
'span' => 'auto',
'comment' => 'vdomah.roles::lang.comments.anonymous_only',
],
'settings[logged_only]' => [
'label' => 'vdomah.roles::lang.fields.logged_only',
'type' => 'checkbox',
'tab' => 'vdomah.roles::lang.editor.access',
'span' => 'auto',
],
],
'primary'
);
});
}
public function getRoleOptions()
{
return array_merge([0 => 'vdomah.roles::lang.fields.empty'], RoleModel::lists('name', 'code'));
}
public function getPermissionOptions()
{
return array_merge([0 => 'vdomah.roles::lang.fields.empty'], PermissionModel::lists('name', 'code'));
}
}

View File

@ -0,0 +1,44 @@
Allows to manage access rights based on roles hierarchy.
## Features
- create your roles and permissions
- group roles into parent - children relations
- manage access to a CMS page
- use Twig helpers to allow or restrict access in views
## Last updates (1.2.0)
- [RainLab.User](http://octobercms.com/plugin/rainlab-user) plugin is no longer required because now it's possible to use [Lovata.Buddies](https://github.com/lovata/oc-buddies-plugin) as front-end auth system
- This may cause issue if you install User or Buddies plugin after Roles is installed. In that case just reinstall the Roles.
# Backend
### Quick start
First, create some roles and/or permissions in Users > Roles Hierarchy.
Optionaly to use the power of roles hierarchy create roles system by assigning parent - child relations between them.
Then you can create some permissions and assign them to roles depending on hierarchy
### CMS Pages access
After at least one role is created you can choose it in CMS Page settings to allow access only for users of that role or it's parents.
Another option is to manage Page access by choosing permission.
Or check "Only anonymous" checkbox to restrict access for any logged user.
### Settings
If you got both RainLab.User and Lovata.Buddies installed you can choose in settings which to use with this plugin.
# Frontend
You can use twig helpers or PHP static functions to allow or restrict access.
### Check if user got specific role
Twig: isRole(role_code, user = null)
PHP: Helper::isRole(role_code, user = null)
Checks if current user has specific role or a role with higher privileges (roles ancestors).
Example:
if user is got admin role: isRole('admin') and isRole('superadmin') will return true.
### Check if user got specific permission
Twig: able(permission_code, user = null)
PHP: Helper::able(permission_code, user = null)
Checks if current user's role has right to execute a permission. Permission should be assigned to the user's role or to a role with lower privileges (roles successors).
Pass user object as second parameter to check it rather then authenticated user.

View File

@ -0,0 +1,52 @@
<?php namespace Vdomah\Roles\Classes;
use Schema;
abstract class AbstractPluginInfo
{
private static $_instance = null;
private function __construct() {}
public static function instance()
{
if (self::$_instance == null) {
$classChild = get_called_class();
self::$_instance = new $classChild;
}
return self::$_instance;
}
abstract function getPluginName();
abstract function getUserClass();
abstract function getUserControllerClass();
abstract function getBackendMenuName();
abstract function authUser();
public function getUserRoleIdColumnName()
{
return 'vdomah_role_id';
}
public function checkRoleIdColumnExists()
{
$user_class = $this->getUserClass();
$model = new $user_class;
$table = $model->getTable();
if (!Schema::hasTable($table) ||
(Schema::hasTable($table) && Schema::hasColumn($table, $this->getUserRoleIdColumnName()))
)
return;
Schema::table($table, function($table)
{
$table->integer($this->getUserRoleIdColumnName())->nullable();
});
}
}

View File

@ -0,0 +1,138 @@
<?php namespace Vdomah\Roles\Classes;
use Auth;
use Vdomah\Roles\Models\Role as RoleModel;
use Vdomah\Roles\Models\Permission as PermissionModel;
use Vdomah\Roles\Models\Settings;
use System\Classes\PluginManager;
/**
* Model
*/
class Helper
{
const USER_PLUGIN_RAINLAB = 'RainLab.User';
const USER_PLUGIN_LOVATA = 'Lovata.Buddies';
const USER_MODEL_RAINLAB = 'RainLab\User\Models\User';
const USER_MODEL_LOVATA = 'Lovata\Buddies\Models\User';
const USER_CONTROLLER_RAINLAB = 'RainLab\User\Controllers\Users';
const USER_CONTROLLER_LOVATA = 'Lovata\Buddies\Controllers\Users';
/*
* Check if given user or auth user has permission with given code.
*
* @param string $perm_code
*
* @param mixed $user
*
* @return bool
*/
public static function able($perm_code, $user = null)
{
$perm = PermissionModel::where('code', $perm_code)->first();
if ($user == null) {
$user = self::getUserPlugin()->authUser();
}
return $user && $user->role && $perm ? $user->role->gotPermission($perm) : false;
}
/*
* Check if given user or auth user belongs to the role with given code.
*
* @param string $code
*
* @param mixed $user
*
* @return bool
*/
public static function isRole($code, $user = null)
{
$out = false;
$role = RoleModel::where('code', $code)->first();
if ($role) {
$role_ids = array_pluck($role->ancestors, 'id');
$role_ids[] = $role->id;
if ($user == null) {
$user = self::getUserPlugin()->authUser();
}
if ($user && in_array($user->vdomah_role_id, $role_ids)) {
$out = true;
}
}
return $out;
}
/*
* Find Role record by code.
*
* @param string $role_code
*
* @return Vdomah\Roles\Models\Role
*/
public static function roleByCode($role_code)
{
return RoleModel::where('code', $role_code)->first();
}
/*
* Recursively iterates through children tree to find if any child's role matches the permission role.
*
* @param collection $children
*
* @param \Vdomah\Roles\Models\Permission $perm
*
* @return bool
*/
public static function iterateChildren($children, $perm)
{
$out = false;
foreach ($children as $child) {
if ($child->id == $perm->role_id) {
$out = true;
} elseif ($child->children != null) {
$out = self::iterateChildren($child->children, $perm);
}
if ($out)
break;
}
return $out;
}
/*
* Get user plugin info object by detecting presence in the system.
*
* @return \Vdomah\Roles\Classes\AbstractPluginInfo
*/
public static function getUserPlugin()
{
$userPluginInfo = null;
$userPlugin = Settings::get('user_plugin');
if (!in_array($userPlugin, [self::USER_PLUGIN_RAINLAB, self::USER_PLUGIN_LOVATA])) {
if (PluginManager::instance()->exists(self::USER_PLUGIN_RAINLAB))
$userPlugin = self::USER_PLUGIN_RAINLAB;
if (PluginManager::instance()->exists(self::USER_PLUGIN_LOVATA))
$userPlugin = self::USER_PLUGIN_LOVATA;
}
if ($userPlugin == self::USER_PLUGIN_LOVATA) {
$userPluginInfo = LovataBuddies::instance();
} elseif ($userPlugin == self::USER_PLUGIN_RAINLAB) {
$userPluginInfo = RainLabUser::instance();
}
return $userPluginInfo;
}
}

View File

@ -0,0 +1,31 @@
<?php namespace Vdomah\Roles\Classes;
class LovataBuddies extends AbstractPluginInfo
{
const ADAPTER_PLUGIN = 'Vdomah.RolesBuddies';
public function getPluginName()
{
return 'Lovata.Buddies';
}
public function getUserClass()
{
return 'Lovata\Buddies\Models\User';
}
public function getUserControllerClass()
{
return 'Lovata\Buddies\Controllers\Users';
}
public function getBackendMenuName()
{
return 'main-menu-buddies';
}
public function authUser()
{
return \Lovata\Buddies\Facades\AuthHelper::getUser();
}
}

View File

@ -0,0 +1,31 @@
<?php namespace Vdomah\Roles\Classes;
class RainLabUser extends AbstractPluginInfo
{
const ADAPTER_PLUGIN = 'Vdomah.RolesUser';
public function getPluginName()
{
return 'RainLab.User';
}
public function getUserClass()
{
return 'RainLab\User\Models\User';
}
public function getUserControllerClass()
{
return 'RainLab\User\Controllers\Users';
}
public function getBackendMenuName()
{
return 'user';
}
public function authUser()
{
return \Auth::getUser();
}
}

View File

@ -0,0 +1,124 @@
<?php namespace Vdomah\Roles\Components;
use Lang;
use Auth;
use Event;
use Flash;
use Request;
use Redirect;
use Cms\Classes\Page;
use Cms\Classes\ComponentBase;
use ValidationException;
use Vdomah\Roles\Classes\Helper;
use Vdomah\Roles\Models\Role as RoleModel;
use Vdomah\Roles\Models\Permission as PermissionModel;
class Access extends ComponentBase
{
public function componentDetails()
{
return [
'name' => 'vdomah.roles::lang.access.label',
'description' => 'vdomah.roles::lang.access.desc'
];
}
public function defineProperties()
{
return [
'redirect' => [
'title' => 'vdomah.roles::lang.access.redirect_title',
'description' => 'vdomah.roles::lang.access.redirect_desc',
'type' => 'dropdown',
'default' => ''
],
'redirectAuth' => [
'title' => 'vdomah.roles::lang.access.redirect_auth_title',
'description' => 'vdomah.roles::lang.access.redirect_auth_desc',
'type' => 'dropdown',
'default' => ''
]
];
}
public function getRedirectOptions()
{
return [''=>'- none -'] + Page::sortBy('baseFileName')->lists('baseFileName', 'baseFileName');
}
public function getRedirectAuthOptions()
{
return [''=>'- none -'] + Page::sortBy('baseFileName')->lists('baseFileName', 'baseFileName');
}
/**
* Executed when this component is bound to a page or layout.
*/
public function onRun()
{
$isAuthenticated = Helper::getUserPlugin()->authUser() ? true : false;
if ($isAuthenticated) {
$redirectUrl = $this->controller->pageUrl($this->property('redirectAuth'));
} else {
$redirectUrl = $this->controller->pageUrl($this->property('redirect'));
}
if ($this->page->anonymous_only && $isAuthenticated) {
if (get('redirect')) {
$redirectUrl = get('redirect');
}
return Redirect::intended($redirectUrl);
}
if ($this->page->logged_only && !$isAuthenticated) {
if (get('redirect')) {
$redirectUrl = get('redirect');
}
return Redirect::guest($redirectUrl);
}
if ($redirectUrl) {
// from v1.2.7 page role and permission are stored as codes in string format.
// Backwards compatibility: if role and permission are stored as id (int) it'll also work
if (is_string($this->page->role)) {
$allowedRole = RoleModel::whereCode($this->page->role)->first();
} else {
$allowedRole = RoleModel::find($this->page->role);
}
if (is_string($this->page->permission)) {
$allowedPerm = PermissionModel::whereCode($this->page->permission)->first();
} else {
$allowedPerm = PermissionModel::find($this->page->permission);
}
$allowedByRole = true;
if ($allowedRole) {
if ($isAuthenticated)
$allowedByRole = Helper::isRole($allowedRole->code);
else
$allowedByRole = false;
}
$allowedByPermission = true;
if ($allowedPerm) {
if ($isAuthenticated)
$allowedByPermission = Helper::able($allowedPerm->code);
else
$allowedByPermission = false;
}
if (!$isAuthenticated) {
$redirectUrl .= '?redirect=' . $_SERVER['REQUEST_URI'];
}
if (!$allowedByRole || !$allowedByPermission) {
return Redirect::guest($redirectUrl);
}
}
}
}

View File

@ -0,0 +1,8 @@
{
"name": "vdomah/roles-plugin",
"type": "october-plugin",
"description": "None",
"require": {
"composer/installers": "~1.0"
}
}

View File

@ -0,0 +1,40 @@
<?php namespace Vdomah\Roles\Controllers;
use Backend\Classes\Controller;
use BackendMenu;
use Flash;
use Vdomah\Roles\Models\Permission as PermissionModel;
use Vdomah\Roles\Classes\Helper;
class Permissions extends Controller
{
public $implement = ['Backend\Behaviors\ListController','Backend\Behaviors\FormController'];
public $listConfig = 'config_list.yaml';
public $formConfig = 'config_form.yaml';
public function __construct()
{
parent::__construct();
BackendMenu::setContext(Helper::getUserPlugin()->getPluginName(), Helper::getUserPlugin()->getBackendMenuName(), 'permissions_h');
}
public function index_onDelete()
{
if(($checkedIds = post('checked')) && is_array($checkedIds) && count($checkedIds))
{
foreach ($checkedIds as $roleId)
{
if (!$role = PermissionModel::find($roleId))
continue;
$role->delete();
}
Flash::success('The role has been deleted successfully.');
}
return $this->listRefresh();
}
}

View File

@ -0,0 +1,42 @@
<?php namespace Vdomah\Roles\Controllers;
use Backend\Classes\Controller;
use BackendMenu;
use Redirect;
use Flash;
use Vdomah\Roles\Models\Role as RoleModel;
use Vdomah\Roles\Models\Permission as PermissionModel;
use Backend;
use Vdomah\Roles\Classes\Helper;
class Roles extends Controller
{
public $implement = ['Backend\Behaviors\ListController','Backend\Behaviors\FormController'];
public $listConfig = 'config_list.yaml';
public $formConfig = 'config_form.yaml';
public $roles;
public $permissions;
public function __construct()
{
parent::__construct();
$this->roles = RoleModel::get();
$this->permissions = PermissionModel::get();
BackendMenu::setContext(Helper::getUserPlugin()->getPluginName(), Helper::getUserPlugin()->getBackendMenuName(), 'roles_h');
}
public function onAssignPerm()
{
if (post('perm_id') && post('role_id')) {
$p = PermissionModel::find(post('perm_id'));
$p->role_id = post('role_id');
$p->save();
}
return Redirect::to(Backend::url('vdomah/roles/roles'));
}
}

View File

@ -0,0 +1,17 @@
<div data-control="toolbar">
<a href="<?= Backend::url('vdomah/roles/permissions/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?></a>
<button
class="btn btn-default oc-icon-trash-o"
disabled="disabled"
onclick="$(this).data('request-data', {checked: $('.control-list').listWidget('getChecked')})"
data-request="onDelete"
data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
data-trigger-action="enable"
data-trigger=".control-list input[type=checkbox]"
data-trigger-condition="checked"
data-request-success="$(this).prop('disabled', false)"
data-stripe-load-indicator>
<?= e(trans('backend::lang.list.delete_selected')) ?>
</button>
</div>

View File

@ -0,0 +1,10 @@
name: Permissions
form: $/vdomah/roles/models/permission/fields.yaml
modelClass: Vdomah\Roles\Models\Permission
defaultRedirect: vdomah/roles/permissions
create:
redirect: 'vdomah/roles/permissions/update/:id'
redirectClose: vdomah/roles/permissions
update:
redirect: vdomah/roles/permissions
redirectClose: vdomah/roles/permissions

View File

@ -0,0 +1,11 @@
list: $/vdomah/roles/models/permission/columns.yaml
modelClass: Vdomah\Roles\Models\Permission
title: Permissions
noRecordsMessage: 'backend::lang.list.no_records'
showSetup: true
showCheckboxes: true
toolbar:
buttons: list_toolbar
search:
prompt: 'backend::lang.list.search_prompt'
recordUrl: 'vdomah/roles/permissions/update/:id'

View File

@ -0,0 +1,46 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('vdomah/roles/permissions') ?>">Permissions</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<?= Form::open(['class' => 'layout']) ?>
<div class="layout-row">
<?= $this->formRender() ?>
</div>
<div class="form-buttons">
<div class="loading-indicator-container">
<button
type="submit"
data-request="onSave"
data-hotkey="ctrl+s, cmd+s"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-primary">
<?= e(trans('backend::lang.form.create')) ?>
</button>
<button
type="button"
data-request="onSave"
data-request-data="close:1"
data-hotkey="ctrl+enter, cmd+enter"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-default">
<?= e(trans('backend::lang.form.create_and_close')) ?>
</button>
<span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('vdomah/roles/permissions') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('vdomah/roles/permissions') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
<?php endif ?>

View File

@ -0,0 +1 @@
<?= $this->listRender() ?>

View File

@ -0,0 +1,22 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('vdomah/roles/permissions') ?>">Permissions</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<div class="form-preview">
<?= $this->formRenderPreview() ?>
</div>
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<?php endif ?>
<p>
<a href="<?= Backend::url('vdomah/roles/permissions') ?>" class="btn btn-default oc-icon-chevron-left">
<?= e(trans('backend::lang.form.return_to_list')) ?>
</a>
</p>

View File

@ -0,0 +1,54 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('vdomah/roles/permissions') ?>">Permissions</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<?= Form::open(['class' => 'layout']) ?>
<div class="layout-row">
<?= $this->formRender() ?>
</div>
<div class="form-buttons">
<div class="loading-indicator-container">
<button
type="submit"
data-request="onSave"
data-request-data="redirect:0"
data-hotkey="ctrl+s, cmd+s"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-primary">
<?= e(trans('backend::lang.form.save')) ?>
</button>
<button
type="button"
data-request="onSave"
data-request-data="close:1"
data-hotkey="ctrl+enter, cmd+enter"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-default">
<?= e(trans('backend::lang.form.save_and_close')) ?>
</button>
<button
type="button"
class="oc-icon-trash-o btn-icon danger pull-right"
data-request="onDelete"
data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>">
</button>
<span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('vdomah/roles/permissions') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('vdomah/roles/permissions') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
<?php endif ?>

View File

@ -0,0 +1,3 @@
<div data-control="toolbar">
<a href="<?= Backend::url('vdomah/roles/roles/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?></a>
</div>

View File

@ -0,0 +1,10 @@
name: Roles
form: $/vdomah/roles/models/role/fields.yaml
modelClass: Vdomah\Roles\Models\Role
defaultRedirect: vdomah/roles/roles
create:
redirect: 'vdomah/roles/roles/update/:id'
redirectClose: vdomah/roles/roles
update:
redirect: vdomah/roles/roles
redirectClose: vdomah/roles/roles

View File

@ -0,0 +1,12 @@
list: $/vdomah/roles/models/role/columns.yaml
modelClass: Vdomah\Roles\Models\Role
title: Roles
noRecordsMessage: 'backend::lang.list.no_records'
showSetup: true
showCheckboxes: true
toolbar:
buttons: list_toolbar
search:
prompt: 'backend::lang.list.search_prompt'
recordUrl: 'vdomah/roles/roles/update/:id'
showTree: true

View File

@ -0,0 +1,46 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('vdomah/roles/roles') ?>">Roles</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<?= Form::open(['class' => 'layout']) ?>
<div class="layout-row">
<?= $this->formRender() ?>
</div>
<div class="form-buttons">
<div class="loading-indicator-container">
<button
type="submit"
data-request="onSave"
data-hotkey="ctrl+s, cmd+s"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-primary">
<?= e(trans('backend::lang.form.create')) ?>
</button>
<button
type="button"
data-request="onSave"
data-request-data="close:1"
data-hotkey="ctrl+enter, cmd+enter"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-default">
<?= e(trans('backend::lang.form.create_and_close')) ?>
</button>
<span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('vdomah/roles/roles') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('vdomah/roles/roles') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
<?php endif ?>

View File

@ -0,0 +1,56 @@
<!--<div style="margin: 0 20px 10px;"><div data-control="toolbar">
<a href="<?= Backend::url('vdomah/roles/roles/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?> <?= e(trans('vdomah.roles::lang.fields.role')) ?></a>
</div>-->
<!--<div class="help-block"><?= e(trans('vdomah.roles::lang.toolbar.comment')) ?></div>-->
<div>
<h3 style="margin: 0 20px 10px;"><?= e(trans('vdomah.roles::lang.list.roles')) ?></h3>
</div>
<?= $this->listRender() ?>
<div>
<h3 style="margin: 0 20px 10px;"><?= e(trans('vdomah.roles::lang.list.roles_assign')) ?></h3>
</div>
<div class="control-list list-unresponsive">
<table class="table data">
<thead>
<tr>
<th class="list-checkbox">
<div class="checkbox custom-checkbox nolabel">
<input type="checkbox" id="checkboxAll" />
<label for="checkboxAll"></label>
</div>
</th>
<th class=""><a href="<?= Backend::url('vdomah/roles/permissions') ?>" style="text-decoration: underline">Permissions</a></th>
<?php foreach($this->roles as $role): ?>
<th class=""><a href="<?= Backend::url('vdomah/roles/roles/update', ['id' => $role->id]) ?>" style="text-decoration: underline"><?=$role->name?></a></th>
<?php endforeach; ?>
</tr>
</thead>
<tbody>
<?php foreach($this->permissions as $permission): ?>
<tr>
<td class="list-checkbox nolink">
<div class="checkbox custom-checkbox nolabel">
<input id="checkbox_1" type="checkbox" />
<label for="checkbox_1">Check</label>
</div>
</td>
<td><?=$permission->name?></td>
<?php foreach($this->roles as $role): ?>
<td><button
data-request="onAssignPerm"
data-request-data="role_id: <?=$role->id?>, perm_id: <?=$permission->id?>"
data-success="window.location.reload()"
>
<?php if($role->gotPermission($permission)): ?>
<i class="icon-check" style="color: green;"></i>
<?php else: ?>
<i class="icon-ban" style="color: #ff1c1c;"></i>
<?php endif; ?>
</button></td>
<?php endforeach; ?>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>

View File

@ -0,0 +1,22 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('vdomah/roles/roles') ?>">Roles</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<div class="form-preview">
<?= $this->formRenderPreview() ?>
</div>
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<?php endif ?>
<p>
<a href="<?= Backend::url('vdomah/roles/roles') ?>" class="btn btn-default oc-icon-chevron-left">
<?= e(trans('backend::lang.form.return_to_list')) ?>
</a>
</p>

View File

@ -0,0 +1,54 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('vdomah/roles/roles') ?>">Roles</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<?= Form::open(['class' => 'layout']) ?>
<div class="layout-row">
<?= $this->formRender() ?>
</div>
<div class="form-buttons">
<div class="loading-indicator-container">
<button
type="submit"
data-request="onSave"
data-request-data="redirect:0"
data-hotkey="ctrl+s, cmd+s"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-primary">
<?= e(trans('backend::lang.form.save')) ?>
</button>
<button
type="button"
data-request="onSave"
data-request-data="close:1"
data-hotkey="ctrl+enter, cmd+enter"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-default">
<?= e(trans('backend::lang.form.save_and_close')) ?>
</button>
<button
type="button"
class="oc-icon-trash-o btn-icon danger pull-right"
data-request="onDelete"
data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>">
</button>
<span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('vdomah/roles/roles') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('vdomah/roles/roles') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
<?php endif ?>

View File

@ -0,0 +1,48 @@
<?php return [
'plugin' => [
'name' => 'Hierarchic Roles',
'description' => 'Allows to manage access rights based on roles hierarchy',
'description_settings' => 'Choose front-end auth plugin to integrate',
],
'fields' => [
'name' => 'Name',
'parent' => 'Parent',
'role' => 'Role',
'permission' => 'Permission',
'code' => 'Code',
'empty' => ' - None - ',
'anonymous_only' => 'Anonymous only',
'logged_only' => 'Authorized users only',
'user_plugin' => 'User Plugin',
'user_plugin_comment' => 'RainLab.User and Lovata.Buddies are available if present in the system',
],
'role' => [
'label' => 'Role',
],
'toolbar' => [
'comment' => 'To edit a role click the role title in the table header',
],
'menu' => [
'users' => 'Users',
'roles_h' => 'Roles Hierarchy',
'permissions_h' => 'Permissions Hierarchy',
],
'access' => [
'label' => 'Access',
'desc' => 'Manage user access to pages by roles',
'redirect_title' => 'Redirect for anonymous',
'redirect_desc' => 'Page to redirect unauthorized users trying open a page allowed only for authorized',
'redirect_auth_title' => 'Redirect for authorized users',
'redirect_auth_desc' => 'Page to redirect authorized users trying open a page allowed only for unauthorized',
],
'list' => [
'roles' => 'Roles list',
'roles_assign' => 'Permissions to Roles assignment',
],
'comments' => [
'anonymous_only' => 'Allowed only for unauthorized users',
],
'editor' => [
'access' => 'Access',
],
];

View File

@ -0,0 +1,18 @@
<?php return [
'plugin' => [
'name' => 'Los roles jerárquicos',
'description' => '',
],
'fields' => [
'name' => 'Nombre',
'parent' => 'Padre',
'code' => 'Código',
'role' => 'Role',
],
'role' => [
'label' => 'Role',
],
'editor' => [
'access' => 'Acceso',
],
];

View File

@ -0,0 +1,46 @@
<?php return [
'plugin' => [
'name' => 'Иерархия Ролей',
'description' => 'Управление доступом используя иерархические правила доступа',
'description_settings' => 'Выбор плагина аутентификации для интегрирования',
],
'fields' => [
'name' => 'Имя',
'parent' => 'Родитель',
'role' => 'Роль',
'permission' => 'Разрешение',
'code' => 'Код',
'empty' => ' - Нет - ',
'anonymous_only' => 'Только для анонимов',
'logged_only' => 'Только для авторизированных',
],
'role' => [
'label' => 'Роль',
],
'toolbar' => [
'comment' => 'Для редактирования роли нажмите на ее название в верхней части таблицы',
],
'menu' => [
'users' => 'Пользователи',
'roles_h' => 'Иерархия Ролей',
'permissions_h' => 'Иерархия Разрешений',
],
'access' => [
'label' => 'Доступ',
'desc' => 'Управление доступом к страницам используя иерархию ролей и разрешений',
'redirect_title' => 'Перенаправление для анонимов',
'redirect_desc' => 'Страница куда перенаправлять анонимов при попытке открыть страницу для авторизированных пользователей',
'redirect_auth_title' => 'Перенаправление для авторизированных',
'redirect_auth_desc' => 'Страница куда перенаправлять авторизированных при попытке открыть страницу только для анонимов',
],
'list' => [
'roles' => 'Список ролей',
'roles_assign' => 'Присвоение разрешений ролям',
],
'comments' => [
'anonymous_only' => 'Доступна только для неавторизированных пользователей',
],
'editor' => [
'access' => 'Доступы',
],
];

View File

@ -0,0 +1,38 @@
<?php namespace Vdomah\Roles\Models;
use Model;
/**
* Model
*/
class Permission extends Model
{
use \October\Rain\Database\Traits\Validation;
public $implement = ['@RainLab.Translate.Behaviors.TranslatableModel'];
public $translatable = ['name'];
/*
* Validation
*/
public $rules = [
];
/*
* Disable timestamps by default.
* Remove this line if timestamps are defined in the database table.
*/
public $timestamps = false;
/**
* @var string The database table used by the model.
*/
public $table = 'vdomah_roles_permissions';
public $belongsTo = [
'role' => [
'Vdomah\Roles\Models\Role',
],
];
}

View File

@ -0,0 +1,96 @@
<?php namespace Vdomah\Roles\Models;
use Model;
use Auth;
use Vdomah\Roles\Models\Permission as PermissionModel;
use Vdomah\Roles\Classes\Helper;
/**
* Model
*/
class Role extends Model
{
use \October\Rain\Database\Traits\Validation;
use \October\Rain\Database\Traits\SimpleTree;
public $implement = ['@RainLab.Translate.Behaviors.TranslatableModel'];
public $translatable = ['name'];
/*
* Validation
*/
public $rules = [
];
public $fillable = [
'name',
'code',
];
/*
* Disable timestamps by default.
* Remove this line if timestamps are defined in the database table.
*/
public $timestamps = false;
/**
* @var string The database table used by the model.
*/
public $table = 'vdomah_roles_roles';
public $hasMany = [
'children' => [
'Vdomah\Roles\Models\Role',
'key' => 'parent_id',
],
'permissions' => [
'Vdomah\Roles\Models\Permission',
],
];
public function getParentOptions()
{
if ($this->exists) {
$id = $this->id;
} else {
$id = 0;
}
return array_merge([0 => '- None -'], Role::where('id', '!=', $id)
->lists('name', 'id'));
}
public function getParentNameAttribute()
{
return $this->parent ? $this->parent->name : '';
}
public function gotPermission($perm)
{
$out = false;
if ($this->id == $perm->role_id) {
$out = true;
} else {
if ($this->children != null) {
$out = Helper::iterateChildren($this->children, $perm);
}
}
return $out;
}
public function getAncestorsAttribute()
{
$ancestors = [];
$current = $this->parent;
while ($current != null) {
$ancestors[] = $current;
$current = $current->parent;
}
return $ancestors;
}
}

View File

@ -0,0 +1,24 @@
<?php namespace Vdomah\Roles\Models;
use October\Rain\Database\Model;
use System\Classes\PluginManager;
class Settings extends Model
{
public $implement = ['System.Behaviors.SettingsModel'];
public $settingsCode = 'vdomah_roles_settings';
public $settingsFields = 'fields.yaml';
public function getUserPluginOptions()
{
$options = [];
if (PluginManager::instance()->exists('RainLab.User'))
$options['RainLab.User'] = 'RainLab.User';
if (PluginManager::instance()->exists('Lovata.Buddies'))
$options['Lovata.Buddies'] = 'Lovata.Buddies';
return $options;
}
}

View File

@ -0,0 +1,15 @@
columns:
name:
label: 'vdomah.roles::lang.fields.name'
type: text
searchable: true
sortable: true
code:
label: 'vdomah.roles::lang.fields.code'
type: text
searchable: true
sortable: true
role:
label: 'vdomah.roles::lang.fields.role'
relation: role
select: name

View File

@ -0,0 +1,17 @@
fields:
name:
label: 'vdomah.roles::lang.fields.name'
oc.commentPosition: ''
span: auto
type: text
code:
label: 'vdomah.roles::lang.fields.code'
span: auto
oc.commentPosition: ''
preset:
field: name
type: slug
type: text
role:
label: 'vdomah.roles::lang.fields.role'
type: relation

View File

@ -0,0 +1,16 @@
columns:
name:
label: 'vdomah.roles::lang.fields.name'
type: text
searchable: true
sortable: true
ParentName:
label: 'vdomah.roles::lang.fields.parent'
type: text
searchable: true
sortable: true
code:
label: 'vdomah.roles::lang.fields.code'
type: text
searchable: true
sortable: true

View File

@ -0,0 +1,20 @@
fields:
name:
label: 'vdomah.roles::lang.fields.name'
span: auto
oc.commentPosition: ''
type: text
code:
label: 'vdomah.roles::lang.fields.code'
span: auto
comment: 'code'
preset:
field: name
type: slug
type: text
parent:
label: 'vdomah.roles::lang.fields.parent'
oc.commentPosition: ''
span: auto
type: relation
emptyOption: 'vdomah.roles::lang.fields.empty'

View File

@ -0,0 +1,7 @@
fields:
user_plugin:
span: left
label: vdomah.roles::lang.fields.user_plugin
type: dropdown
default: RainLab.User
comment: vdomah.roles::lang.fields.user_plugin_comment

View File

@ -0,0 +1,6 @@
plugin:
name: 'vdomah.roles::lang.plugin.name'
description: 'vdomah.roles::lang.plugin.description'
author: 'Art Gek'
icon: oc-icon-cubes
homepage: ''

View File

@ -0,0 +1,33 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuddiesAddRoleIdColumn extends Migration
{
public function up()
{
if (!Schema::hasTable('lovata_buddies_users') ||
Schema::hasColumn('lovata_buddies_users', 'role_id')
)
return;
Schema::table('lovata_buddies_users', function($table)
{
$table->integer('role_id')->nullable();
});
}
public function down()
{
if (!Schema::hasTable('lovata_buddies_users') ||
!Schema::hasColumn('lovata_buddies_users', 'role_id')
)
return;
Schema::table('lovata_buddies_users', function($table)
{
$table->dropColumn('role_id');
});
}
}

View File

@ -0,0 +1,27 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableCreateVdomahRolesPermissions extends Migration
{
public function up()
{
if (Schema::hasTable('vdomah_roles_permissions'))
return;
Schema::create('vdomah_roles_permissions', function($table)
{
$table->engine = 'InnoDB';
$table->increments('id');
$table->text('name');
$table->string('code', 255);
$table->integer('role_id')->unsigned();
});
}
public function down()
{
Schema::dropIfExists('vdomah_roles_permissions');
}
}

View File

@ -0,0 +1,27 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableCreateVdomahRolesRoles extends Migration
{
public function up()
{
if (Schema::hasTable('vdomah_roles_roles'))
return;
Schema::create('vdomah_roles_roles', function($table)
{
$table->engine = 'InnoDB';
$table->increments('id');
$table->string('name', 255);
$table->integer('parent_id')->unsigned()->nullable();
$table->string('code', 255);
});
}
public function down()
{
Schema::dropIfExists('vdomah_roles_roles');
}
}

View File

@ -0,0 +1,41 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateLovataBuddiesUsersRenameRoleId extends Migration
{
public $table = 'lovata_buddies_users';
public $column = 'vdomah_roles_role_id';
public $column_old = 'role_id';
public function up()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column) ||
!Schema::hasColumn($this->table, $this->column_old)
)
return;
Schema::table($this->table, function($table)
{
$table->renameColumn($this->column_old, $this->column);
});
}
public function down()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column_old) ||
!Schema::hasColumn($this->table, $this->column)
)
return;
Schema::table($this->table, function($table)
{
$table->renameColumn($this->column, $this->column_old);
});
}
}

View File

@ -0,0 +1,41 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateLovataBuddiesUsersRenameRoleId2 extends Migration
{
public $table = 'lovata_buddies_users';
public $column = 'vdomah_role_id';
public $column_old = 'vdomah_roles_role_id';
public function up()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column) ||
!Schema::hasColumn($this->table, $this->column_old)
)
return;
Schema::table($this->table, function($table)
{
$table->renameColumn($this->column_old, $this->column);
});
}
public function down()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column_old) ||
!Schema::hasColumn($this->table, $this->column)
)
return;
Schema::table($this->table, function($table)
{
$table->renameColumn($this->column, $this->column_old);
});
}
}

View File

@ -0,0 +1,41 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateRoleIdNullable extends Migration
{
public $column = 'vdomah_role_id';
public $tables;
public function __construct()
{
$this->tables = ['users', 'lovata_buddies_users'];
}
public function up()
{
foreach ($this->tables as $table) {
if (!Schema::hasTable($table))
continue;
if (!Schema::hasColumn($table, $this->column)) {
Schema::table($table, function($table)
{
$table->integer($this->column)->nullable();
});
} else {
Schema::table($table, function($table)
{
$table->integer($this->column)->nullable()->change();
});
}
}
}
public function down()
{
}
}

View File

@ -0,0 +1,41 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateUsersRenameRoleId extends Migration
{
public $table = 'users';
public $column = 'vdomah_roles_role_id';
public $column_old = 'role_id';
public function up()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column) ||
!Schema::hasColumn($this->table, $this->column_old)
)
return;
Schema::table($this->table, function($table)
{
$table->renameColumn($this->column_old, $this->column);
});
}
public function down()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column_old) ||
!Schema::hasColumn($this->table, $this->column)
)
return;
Schema::table($this->table, function($table)
{
$table->renameColumn($this->column, $this->column_old);
});
}
}

View File

@ -0,0 +1,41 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateUsersRenameRoleId2 extends Migration
{
public $table = 'users';
public $column = 'vdomah_role_id';
public $column_old = 'vdomah_roles_role_id';
public function up()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column) ||
!Schema::hasColumn($this->table, $this->column_old)
)
return;
Schema::table($this->table, function($table)
{
$table->renameColumn($this->column_old, $this->column);
});
}
public function down()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column_old) ||
!Schema::hasColumn($this->table, $this->column)
)
return;
Schema::table($this->table, function($table)
{
$table->renameColumn($this->column, $this->column_old);
});
}
}

View File

@ -0,0 +1,29 @@
<?php namespace Vdomah\Roles\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class Migration104 extends Migration
{
public function up()
{
if (!Schema::hasTable('users') || Schema::hasColumn('users', 'role_id'))
return;
Schema::table('users', function($table)
{
$table->integer('role_id');
});
}
public function down()
{
if (!Schema::hasTable('users') || !Schema::hasColumn('users', 'role_id'))
return;
Schema::table('users', function($table)
{
$table->dropColumn('role_id');
});
}
}

View File

@ -0,0 +1,70 @@
1.0.0:
- 'Initialize plugin.'
- builder_table_create_vdomah_roles_roles.php
- builder_table_create_vdomah_roles_permissions.php
- users_add_role_id_column.php
1.0.1:
- 'Permission name transaltable. Readme update. Move static methods to Helper'
1.0.2:
- 'Soft implementation of RainLab.Translate'
1.0.3:
- 'SimpleTree trait implemented, fixed roles dropdown in user form'
1.0.4:
- 'Replaced hardcoded backend urls with dynamic links in view (thanks to Damian Verhaar)'
1.0.5:
- 'Replaced hardcoded backend urls with dynamic links in controller (thanks to Damian Verhaar)'
1.1.0:
- 'CMS Pages access managment by assigning roles and permissions'
1.1.1:
- 'CMS Pages access managment moved to separate tab'
1.1.2:
- 'Fixed bug wich prevented returning the whole ancestor tree in a role (thanks Daniel Tamas). En translations updated'
1.1.3:
- '"Logged only" CMS page parameter added'
1.2.0:
- 'Lovata.Buddies plugin integration'
1.2.1:
- 'Check if users table exists in migrations before altering it'
- buddies_add_role_id_column.php
1.2.2:
- 'Add fillable to Role model'
1.2.3:
- 'role_id field nullable'
1.2.4:
- 'Check role_id exists in users table and add if no'
1.2.5:
- 'Added isRole and able methods to user object'
1.2.6:
- 'Added roleByCode twig helper and corresponding Helper::roleByCode php helper'
1.2.7:
- 'Page role and permission are stored as codes. Backwards compatibility for id (int) so no changes are mandatory for existing projects'
1.2.8: Fixed roleByCode helper.
1.3.0:
- !!! Rename role_id to vdomah_roles_role_id (needed by guidelines).
- builder_table_update_buddies_rename_role_id_column.php
- builder_table_update_users_rename_role_id_column.php
1.3.1: vdomah_roles_role_id made fillable
1.3.2:
- Fixed v1.3.0 migrations declarations
- builder_table_update_buddies_rename_role_id_column.php
- builder_table_update_users_rename_role_id_column.php
1.3.3:
- "Permissions type:relation removed"
1.3.4:
- Rename vdomah_roles_role_id column to vdomah_role_id
- builder_table_update_buddies_rename_role_id_column2.php
- builder_table_update_users_rename_role_id_column2.php
1.3.5:
- Fix class names in migrations from v1.3.4
1.3.6:
- isRole fix error when user not logged in
1.3.7:
- Helper::iterateChildren fix. Documented Helper class.
1.3.8:
- "Make sure vdomah_role_id column in users/lovata_buddies_users is nullable."
- builder_table_update_role_id_nullable.php
1.3.9:
- "Roles list as tree."
1.3.10:
- "emptyOption added in user form role dropdown."
1.3.11: Role field extended - prevent from appearing in repeater of the same model form.

View File

@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
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
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
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

View File

@ -0,0 +1,20 @@
<?php namespace Vdomah\RolesRainLabUser;
use System\Classes\PluginBase;
class Plugin extends PluginBase
{
public $require = ['RainLab.User', 'Vdomah.Roles'];
public function registerComponents()
{
return [
];
}
public function registerSettings()
{
return [
];
}
}

View File

@ -0,0 +1,20 @@
# Vdomah.Roles plugin adapter for RainLab.User plugin
This is not independent plugin. It's used to connect two plugins by requiring both.
The reason I had to do it this way - because Vdomah.Roles supports both Lovata.Buddies and RainLab.User
and it can't use $require directive to require both because they are mutually exclusive.
So to use Vdomah.Roles with RainLab.User you need to install just this plugin.
It's the only purpose of it.
## Installation
### Artisan
Using the Laravels CLI is the fastest way to get started. Just run the following commands in a projects root directory:
```bash
php artisan plugin:install vdomah.rolesrainlabuser
```
Or go to your project's Backend Updates section or to plugin's marketplace page and install it.

View File

@ -0,0 +1,8 @@
{
"name": "vdomah/rolesrainlabuser-plugin",
"type": "october-plugin",
"description": "None",
"require": {
"composer/installers": "~1.0"
}
}

View File

@ -0,0 +1,6 @@
<?php return [
'plugin' => [
'name' => 'Roles for RainLab.User',
'description' => 'RainLab.User adapter for Roles plugin: access rights based on roles hierarchy',
],
];

View File

@ -0,0 +1,6 @@
<?php return [
'plugin' => [
'name' => 'Roles para RainLab.User',
'description' => 'RainLab.User adaptor para Roles plugin: derechos de acceso basados en la jerarquía de roles',
],
];

View File

@ -0,0 +1,6 @@
<?php return [
'plugin' => [
'name' => 'Роли для RainLab.User',
'description' => 'RainLab.User адаптер для плагина Roles: права доступа на основе иерархии ролей',
],
];

View File

@ -0,0 +1,6 @@
<?php return [
'plugin' => [
'name' => 'Ролі для RainLab.User',
'description' => 'RainLab.User адаптер для плагіна Roles: права доступу на основі ієрархії ролей',
],
];

View File

@ -0,0 +1,6 @@
plugin:
name: 'vdomah.rolesrainlabuser::lang.plugin.name'
description: 'vdomah.rolesrainlabuser::lang.plugin.description'
author: 'Art Gek'
icon: oc-icon-cubes
homepage: 'https://github.com/vdomah/oc-rolesrainlabuser-plugin'

View File

@ -0,0 +1,37 @@
<?php namespace Vdomah\RolesRainLabUser\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class UsersAddRoleId extends Migration
{
public $table = 'users';
public $column = 'vdomah_role_id';
public function up()
{
if (!Schema::hasTable($this->table) ||
Schema::hasColumn($this->table, $this->column)
)
return;
Schema::table($this->table, function($table)
{
$table->integer($this->column)->nullable();
});
}
public function down()
{
if (!Schema::hasTable($this->table) ||
!Schema::hasColumn($this->table, $this->column)
)
return;
Schema::table($this->table, function($table)
{
$table->dropColumn($this->column);
});
}
}

View File

@ -0,0 +1,3 @@
1.0.0:
- "Initialize plugin. Add role_id column to users table if that field doesn't exist yet."
- users_add_role_id_column.php

View File

@ -12,10 +12,15 @@ forceSecure = 0
requirePassword = 0
==
<?php
function onStart(){
$link = $this->page["url"];
$link = $this->page["url"];
$currentUser = \Auth::user();
$this['filteredData'] = last($currentUser->permission2);
}
?>
==
@ -66,8 +71,14 @@ function onStart(){
<p data-control="flash-message" class="flash-message fade {{ type }}" data-interval="5">
{{ message }}
</p>
{% endflash %} {% if user %} {% partial 'layout-settings-main' %} {% else %} {% partial
'login-page' %} {% endif %}
{% endflash %}
{% if user %}
{% partial 'layout-settings-main' %}
{% else %}
{% partial 'login-page' %}
{% endif %}
<!-- JAVASCRIPT -->
<script src="{{'assets/libs/jquery/jquery.min.js'|theme}}"></script>
@ -81,4 +92,4 @@ function onStart(){
<script src="{{'assets/js/app.js'|theme}}"></script>
{% framework extras %}
</body>
</html>
</html>

View File

@ -1,31 +1,35 @@
items:
-
title: 'Baş Sahypa'
nesting: null
type: url
url: /2023
code: ''
reference: null
cmsPage: null
replace: null
code: dashboard
viewBag:
isHidden: '0'
cssClass: ri-home-gear-line
isExternal: '0'
-
title: 'Taýyn Önüm Sklady'
nesting: null
type: cms-page
code: ''
url: null
code: producedStocks
reference: stock/production
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ri-dashboard-line
isExternal: '0'
-
title: 'Halta Sklad Hereketleri'
nesting: null
type: url
url: /afdf
code: ''
code: bagActions
reference: null
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ri-shopping-bag-line
@ -34,7 +38,7 @@ items:
-
title: 'Halta Hereketleri'
type: cms-page
code: ''
code: bagActions
reference: actions/bag
viewBag:
isHidden: '0'
@ -44,7 +48,7 @@ items:
title: 'Giriş Hereketleri'
type: url
url: /actions/bag/inbox
code: ''
code: bagActions
viewBag:
isHidden: '0'
cssClass: ''
@ -53,16 +57,20 @@ items:
title: 'Çykyş Hereketleri'
type: url
url: /actions/bag/outbox
code: ''
code: bagActions
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Rulon Sklad Hereketleri'
nesting: null
type: url
url: /dsadasd
code: ''
code: rulonActions
reference: null
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ' ri-check-double-line'
@ -71,7 +79,7 @@ items:
-
title: 'Rulon Herketleri'
type: cms-page
code: ''
code: rulonActions
reference: actions/rulon
viewBag:
isHidden: '0'
@ -81,7 +89,7 @@ items:
title: 'Giriş Hereketleri'
type: url
url: /actions/rulon/inbox
code: ''
code: rulonActions
viewBag:
isHidden: '0'
cssClass: ''
@ -90,7 +98,7 @@ items:
title: 'Çykyş Hereketleri'
type: url
url: /actions/rulon/outbox
code: ''
code: rulonActions
viewBag:
isHidden: '0'
cssClass: ''
@ -100,7 +108,7 @@ items:
nesting: null
type: cms-page
url: null
code: ''
code: rawStocks
reference: stock/stocks
cmsPage: null
replace: null
@ -113,7 +121,7 @@ items:
nesting: null
type: url
url: '#a'
code: ''
code: rawActions
reference: null
cmsPage: null
replace: null
@ -126,7 +134,7 @@ items:
title: Hereketler
type: url
url: /product/actions
code: ''
code: rawActions
viewBag:
isHidden: '0'
cssClass: ''
@ -135,7 +143,7 @@ items:
title: 'Täze Haryt Sal'
type: url
url: /product/actions/inbox
code: ''
code: rawActions
viewBag:
isHidden: '0'
cssClass: ''
@ -144,7 +152,7 @@ items:
title: 'Haryt Çykarmak'
type: url
url: /product/actions/outbox
code: ''
code: rawActions
viewBag:
isHidden: '0'
cssClass: ''
@ -154,7 +162,7 @@ items:
nesting: null
type: url
url: /w
code: ''
code: extrudorProduction
reference: null
cmsPage: null
replace: null
@ -165,52 +173,36 @@ items:
items:
-
title: 'Täze Hasabat'
nesting: null
type: cms-page
url: null
code: ''
code: extrudorProduction
reference: production/excruiters
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Hasabat
nesting: null
type: cms-page
url: null
code: ''
code: extrudorProduction
reference: production/report-dynamic
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Aýlar Boýunça'
nesting: null
type: cms-page
url: null
code: ''
code: extrudorProduction
reference: production/all-production-month
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Ýyl Boýunça'
nesting: null
type: cms-page
url: null
code: ''
code: extrudorProduction
reference: production/report-production
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
@ -220,7 +212,7 @@ items:
nesting: null
type: url
url: /ee
code: ''
code: productionRulon
reference: null
cmsPage: null
replace: null
@ -231,65 +223,45 @@ items:
items:
-
title: 'Hasabat Sanawy'
nesting: null
type: cms-page
url: null
code: ''
code: productionRulon
reference: machine/machine
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Rulonlar Sklady'
nesting: null
type: cms-page
url: null
code: ''
code: productionRulon
reference: machine/rulon
cmsPage: null
replace: null
viewBag:
isHidden: '1'
cssClass: ''
isExternal: '0'
-
title: Hasabat
nesting: null
type: cms-page
url: null
code: ''
code: productionRulon
reference: machine/report
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Aýlar boýunça'
nesting: null
type: cms-page
url: null
code: ''
code: productionRulon
reference: machine/report-production-machine
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Mehanikler boýunça'
nesting: null
type: cms-page
url: null
code: ''
code: productionRulon
reference: machine/machine-production-mechanic
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
@ -299,7 +271,7 @@ items:
nesting: null
type: url
url: /tt
code: ''
code: sewerProduction
reference: null
cmsPage: null
replace: null
@ -310,39 +282,27 @@ items:
items:
-
title: 'Hasabat Sanawy'
nesting: null
type: cms-page
url: null
code: ''
code: sewerProduction
reference: sewer/new
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Hasabat
nesting: null
type: cms-page
url: null
code: ''
code: sewerProduction
reference: sewer/report
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: 'Aýlar boýunça'
nesting: null
type: cms-page
url: null
code: ''
code: sewerProduction
reference: sewer/month
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
@ -352,7 +312,7 @@ items:
nesting: null
type: url
url: /ss
code: ''
code: orders
reference: null
cmsPage: null
replace: null
@ -363,65 +323,45 @@ items:
items:
-
title: 'Sargytlar Sanawy'
nesting: null
type: cms-page
url: null
code: ''
code: orders
reference: orders/new
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Logitstika
nesting: null
type: cms-page
url: null
code: ''
code: orders
reference: orders/shipping
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Tölegler
nesting: null
type: cms-page
url: null
code: ''
code: orders
reference: orders/payment-report
cmsPage: null
replace: null
viewBag:
isHidden: '1'
cssClass: ''
isExternal: '0'
-
title: Hasabat
nesting: null
type: cms-page
url: null
code: ''
code: orders
reference: orders/report
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ''
isExternal: '0'
-
title: Žurnal
nesting: null
type: cms-page
url: null
code: ''
code: journal
reference: journal
cmsPage: null
replace: null
viewBag:
isHidden: '0'
cssClass: ri-chat-history-line

View File

@ -92,8 +92,11 @@ function onStart(){
<td style="color: #500101;font-weight: bold;">{{record.amount|number_format}}</td>
<td>{{record.created_at|date('d.m.Y')}}</td>
<td>{{record.stock.name}}</td>
<td style="color: {% if record.status_director == 'accept' %}darkgreen {% else %}darkred {% endif %};">{% if record.status_director == 'accept' %} + {% else %} <a href="#" data-request="onApproveAction" data-request-data="user_type: 'director', id: {{record.id}}" style="color: darkred;" data-request-confirm="Tassyklamak isleyarsinizmi?"> Tassyklanmadyk </a> {% endif %}</td>
<td style="color: {% if record.status_accountant == 'accept' %}darkgreen {% else %}darkred {% endif %};">{% if record.status_accountant == 'accept' %} + {% else %} <a href="#" data-request="onApproveAction" data-request-data="user_type: 'accountant', id: {{record.id}}'" style="color: darkred;" data-request-confirm="Tassyklamak isleyarsinizmi?"> Tassyklanmadyk </a> {% endif %}</td>
<td>{{record.note}}</td>
<td>
<div style="display: flex;justify-content: center;">

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart(){
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$year = $this->param("year");
@ -22,8 +22,6 @@ function onStart(){
$this["year"] = $currentDate->year;
}
$this["production1"] = Romanah\Gokbakja\Models\SewerProduction::whereMonth('date', 1)->whereYear('date', $year)->count() ?? 0;
$this["production2"] = Romanah\Gokbakja\Models\SewerProduction::whereMonth('date', 2)->whereYear('date', $year)->count() ?? 0;
@ -100,6 +98,8 @@ function onStart(){
</form>
</div> -->
<h1>{{filteredData}}</h1>
</div>
</div>
</div>

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart() {
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["month"] = $this->param("month");
$year = $this->param("year");
@ -148,4 +148,4 @@ function onStart() {
</div>
{% partial 'dataTableJs' %}
{% partial 'dataTableJs' %}

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart() {
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["month"] = $this->param("month");
$year = $this->param("year");
@ -134,4 +134,4 @@ function onStart() {
</div>
{% partial 'dataTableJs' %}
{% partial 'dataTableJs' %}

View File

@ -5,14 +5,14 @@ is_hidden = 0
==
<?php
function onStart() {
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["currentYear"] = $currentDate->year;
$this["month"] = $this->param("month");
$mechanicId = $this->param("mechanicId");
$month = $this->param("month");
$this["mechanicProductions"] = Romanah\Gokbakja\Models\ProductionMachine::where('mechanic_id', $mechanicId)->whereMonth('created_at', $month)->whereYear('created_at', $this["currentYear"])->with(['bag_type', 'bag_size', 'machine.building', 'employee', 'mechanic'])->get();
@ -132,4 +132,4 @@ function onStart() {
</div>
{% partial 'dataTableJs' %}
{% partial 'dataTableJs' %}

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart() {
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["currentYear"] = $currentDate->year;
$productionId = $this->param("id");
@ -137,4 +137,4 @@ function onStart() {
</div>
{% partial 'dataTableJs' %}
{% partial 'dataTableJs' %}

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart() {
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["month"] = $this->param("month");
$year = $this->param("year");
@ -147,4 +147,4 @@ function onStart() {
</div>
{% partial 'dataTableJs' %}
{% partial 'dataTableJs' %}

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart(){
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["year"] = $this->param("year");
@ -95,4 +95,4 @@ function onStart(){
</div>
{% partial 'dataTableJs' %}
{% partial 'dataTableJs' %}

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart() {
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["month"] = $this->param("month");
$year = $this->param("year");

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart() {
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["month"] = $this->param("month");

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart() {
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["currentYear"] = $currentDate->year;
$productionId = $this->param("id");
@ -140,4 +140,4 @@ function onStart() {
</div>
{% partial 'dataTableJs' %}
{% partial 'dataTableJs' %}

View File

@ -18,7 +18,7 @@ pageNumber = "{{ :page }}"
<?php
function onStart(){
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$currentDateFormat = Carbon\Carbon::now()->format('Y-m-d');
@ -59,26 +59,30 @@ function onStart(){
{% endput %}
<div class="container-fluid">
<div class="row">
<div class="col-lg">
<a class="card bg-success text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white" id="percentage"><i class="mdi mdi-bullseye-arrow me-3"></i> 0 %</h5>
<p class="card-text" id="all_amount">JEMI: 0 kg</p>
</div>
</a>
<div class="collapse multi-collapse show" id="multiCollapseExample1">
<div class="row">
<div class="col-lg" data-bs-toggle="collapse" href="#multiCollapseExample1"
role="button" aria-expanded="false" aria-controls="multiCollapseExample1">
<a class="card bg-success text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white" id="percentage"><i class="mdi mdi-bullseye-arrow me-3"></i> 0 %</h5>
<p class="card-text" id="all_amount">JEMI: 0 kg</p>
</div>
</a>
</div>
{% for key, record in records %}
<div class="col-md-2" data-bs-toggle="collapse" href="#multiCollapseExample1"
role="button" aria-expanded="false" aria-controls="multiCollapseExample1">
<a class="card bg-info text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white" id="avg_percentage_{{record.id}}"><i
class="mdi mdi-bullseye-arrow me-3"></i> 0 %</h5>
<p class="card-text" id="avg_amount_{{record.id}}">{{record.code}} : 0 kg</p>
</div>
</a>
</div>
{% endfor %}
</div>
{% for key, record in records %}
<div class="col-lg col-sm">
<a class="card bg-info text-white-50">
<div class="card-body">
<h5 class="mb-4 text-white" id="avg_percentage_{{record.id}}"><i
class="mdi mdi-bullseye-arrow me-3"></i> 0 %</h5>
<p class="card-text" id="avg_amount_{{record.id}}">{{record.name}} : 0 kg</p>
</div>
</a>
</div>
{% endfor %}
</div>
<!-- end row -->
<div class="row">
@ -88,7 +92,9 @@ function onStart(){
<div class="card-body">
<div class="row">
<div class="col-md-6">
<h3 class="card-title" style="font-size: 22px;color: #1e2038;" id="headerq">Çig Mallar Boýunça (Soňky üýtgeşme: 0 kg)</h3>
<h3 data-bs-toggle="collapse" href="#multiCollapseExample1"
role="button" aria-expanded="false" aria-controls="multiCollapseExample1" class="card-title" style="font-size: 22px;color: #1e2038;" id="headerq">Çig Mallar
Boýunça (Soňky üýtgeşme: 0 kg)</h3>
<div id="back_btn">
<a href="#">HASABAT</a>
</div>
@ -97,8 +103,9 @@ function onStart(){
<a href="/excruiters" type="button" class="btn btn-danger waves-effect waves-light">
<i class="ri-arrow-left-line align-middle ms-2" style="font-size: 17px;"></i> Yza
</a>
<button data-request="onCalculateReportDaily" type="button" class="btn btn-primary waves-effect waves-light"
data-bs-toggle="modal" data-bs-target="#exampleModalFullscreen">
<button data-request="onCalculateReportDaily" type="button"
class="btn btn-primary waves-effect waves-light" data-bs-toggle="modal"
data-bs-target="#exampleModalFullscreen">
<i class="ri-pie-chart-line align-middle ms-2" style="font-size: 17px;"></i> Günüň
Jemini Jemle
</button>
@ -152,8 +159,8 @@ function onStart(){
<input type="number" oninput="getValues();" step="0.01"
pattern="/^-?\d+\.?\d*$/"
onKeyPress="if(this.value.length==4) return false;"
name="product_{{record.code}}" id="product_{{key}}" class="form-control"
placeholder="{{record.name}} %" disabled>
name="product_{{record.id}}" id="product_{{key}}" class="form-control"
placeholder="{{record.code}} %" disabled>
</th>
{% endfor %}
<th style="background: #daddff;">
@ -182,7 +189,7 @@ function onStart(){
<th>Ekskruiter</th>
<th>Hemmesi</th>
{% for key, record in records %}
<th>{{record.name}}</th>
<th>{{record.code}}</th>
{% endfor %}
<th>Bellik</th>
<th>Sazlama</th>
@ -194,7 +201,8 @@ function onStart(){
{% for key, report in productions %}
<tr>
<td style="font-weight: bold;width: 5%;">{{key + 1}}</td>
<td><a href="#" style="font-weight: bold;color: #0005c5;">{{report.date|date('d.m.Y')}} | {{report.time|date('H:i')}}</a></td>
<td><a href="#" style="font-weight: bold;color: #0005c5;">{{report.date|date('d.m.Y')}}
| {{report.time|date('H:i')}}</a></td>
<td><a href="#" style="font-weight: bold;color: #1e2038;">{{report.shift.desc}}</a></td>
<td style="text-align: center;">
<span class="badge badge-soft-info"
@ -208,15 +216,21 @@ function onStart(){
{% for product in report.pivot_production %}
<td>
{% if report.user_id == user.id %}
<a href="#" data-bs-toggle="modal"
data-bs-target=".bs-example-modal-sm-{{product.id}}">{{product.amount_percentage|number_format(2)}} %</a>
{% if report.user_id == user.id %}
<a href="#" data-bs-toggle="modal"
data-bs-target=".bs-example-modal-sm-{{product.id}}">
{% if product.amount_percentage %}
{{product.amount_percentage|number_format(2)}} %
{% else %}
0 %
{% endif %}
</a>
{% else %}
{% else %}
<a href="#">{{product.amount_percentage|number_format(2)}} %</a>
<a href="#">{{product.amount_percentage|number_format(2)}} %</a>
{% endif %}
{% endif %}
</td>
{% if report.user_id == user.id %}
@ -254,13 +268,15 @@ function onStart(){
<td style="font-weight: bold;color: #0005c5;">{{report.note}}</td>
<td>
{% if report.user_id == user.id %}
<a href="#" data-request="onDeleteProduction" data-request-data="id: {{report.id}}" data-request-confirm="Hasabat # {{report.id}} pozmak isleýäňizmi?" style="font-weight: bold;color: darkred;">POZ</a>
{% else %}
{% if report.user_id == user.id %}
<a href="#" data-request="onDeleteProduction" data-request-data="id: {{report.id}}"
data-request-confirm="Hasabat # {{report.id}} pozmak isleýäňizmi?"
style="font-weight: bold;color: darkred;">POZ</a>
{% else %}
<a href="#" style="font-weight: bold;color: darkorange;">Size degişli däl</a>
<a href="#" style="font-weight: bold;color: darkorange;">Size degişli däl</a>
{% endif %}
{% endif %}
</td>
</tr>
@ -279,7 +295,7 @@ function onStart(){
<th>Ekskruiter</th>
<th>Hemmesi</th>
{% for key, record in records %}
<th>{{record.name}}</th>
<th>{{record.code}}</th>
{% endfor %}
<th>Bellik</th>
<th>Sazlama</th>

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart(){
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["year"] = $this->param("year");

View File

@ -5,7 +5,7 @@ is_hidden = 0
==
<?php
function onStart(){
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$this["year"] = $this->param("year");

View File

@ -38,12 +38,11 @@
<ul class="metismenu list-unstyled" id="side-menu">
<li class="menu-title">Разделы</li>
{% for permission in user.permission2 %}
{% for item in staticMenu.menuItems %}
{% if not item.viewBag.isHidden and item.items|length %}
{% if not item.viewBag.isHidden and item.items|length and permission.code == item.code %}
<li class="{% if (item.isChildActive) %} mm-active {% endif %}">
<a href="javascript: void(0);" class="has-arrow waves-effect {% if (item.isChildActive) %} active {% endif %}" style="text-transform: capitalize;">
@ -53,7 +52,7 @@
<ul class="sub-menu" aria-expanded="{% if (item.isChildActive) %} true {% else %} false {% endif %}">
<!-- <li><a href="/products"> Umumy </a></li> -->
{% for item in item.items if not item.viewBag.isHidden %}
{% for item in item.items if not item.viewBag.isHidden and permission.code == item.code %}
<li><a href="{{ item.url }}" class="{% if (item.isChildActive) %} active {% endif %}" style="text-transform: capitalize;"> {{ item.title }} </a></li>
{% endfor %}
@ -61,7 +60,7 @@
</li>
{% elseif not item.viewBag.isHidden %}
{% elseif not item.viewBag.isHidden and permission.code == item.code %}
<li class="{% if (item.isActive) %} mm-active {% endif %}">
@ -76,6 +75,8 @@
{% endif %}
{% endfor %}
{% endfor %}
</ul>
</div>

View File

@ -4,7 +4,7 @@
function onStart (){
$year = $this->param("year");
$prodId = $this->prodId;
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
$currentDate = Carbon\Carbon::now();
$allAmount = $this->all_amount;