Skip to content

Commit dd5d089

Browse files
ggoffyggoffy
authored
Merge pull request #17 from ggoffy/master
move to RC1
2 parents de98bb8 + 243b984 commit dd5d089

File tree

92 files changed

+3114
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+3114
-557
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
2+
![alt XOOPS CMS](https://xoops.org/images/logoXoopsPhp8.png)
23

34
## wgSimpleAcc module for [XOOPS CMS 2.5.11+](https://xoops.org)
45

‎accounts.php‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
$GLOBALS['xoopsTpl']->assign('accountlist_sort', $accountlist_sort);
8080
$GLOBALS['xoopsTpl']->assign('accounts_submit', $permAccountsSubmit);
8181
}
82+
83+
// Breadcrumbs
84+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ACCOUNTS];
8285
break;
8386
case 'save':
8487
// Security Check
@@ -131,6 +134,10 @@
131134
$accountsObj = $accountsHandler->create();
132135
$form = $accountsObj->getFormAccounts();
133136
$GLOBALS['xoopsTpl']->assign('form', $form->render());
137+
138+
// Breadcrumbs
139+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ACCOUNTS, 'link' => 'accounts.php?op=list'];
140+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ACCOUNT_ADD];
134141
break;
135142
case 'edit':
136143
// Check params
@@ -145,6 +152,10 @@
145152
// Get Form
146153
$form = $accountsObj->getFormAccounts();
147154
$GLOBALS['xoopsTpl']->assign('form', $form->render());
155+
156+
// Breadcrumbs
157+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ACCOUNTS, 'link' => 'accounts.php?op=list'];
158+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ACCOUNT_EDIT];
148159
break;
149160
case 'delete':
150161
// Check params
@@ -211,9 +222,6 @@
211222
break;
212223
}
213224

214-
// Breadcrumbs
215-
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ACCOUNTS];
216-
217225
// Keywords
218226
wgsimpleaccMetaKeywords($helper->getConfig('keywords') . ', ' . \implode(',', $keywords));
219227
unset($keywords);

‎admin/transactions.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@
101101
$transactionDateObj = \DateTime::createFromFormat(_SHORTDATESTRING, Request::getString('tra_date'));
102102
$transactionsObj->setVar('tra_date', $transactionDateObj->getTimestamp());
103103
$transactionsObj->setVar('tra_curid', Request::getInt('tra_curid', 0));
104-
$traAmountin = Request::getString('tra_amountin');
105-
$transactionsObj->setVar('tra_amountin', Utility::StringToFloat($traAmountin));
106-
$traAmountout = Request::getString('tra_amountout');
107-
$transactionsObj->setVar('tra_amountout', Utility::StringToFloat($traAmountout));
104+
$traAmountin = Utility::StringToFloat(Request::getString('tra_amountin'));
105+
$transactionsObj->setVar('tra_amountin', $traAmountin);
106+
$traAmountout = Utility::StringToFloat(Request::getString('tra_amountout'));
107+
$transactionsObj->setVar('tra_amountout', $traAmountout);
108108
$transactionsObj->setVar('tra_taxid', Request::getInt('tra_taxid', 0));
109109
$transactionsObj->setVar('tra_status', Request::getInt('tra_status', 0));
110110
$transactionsObj->setVar('tra_comments', Request::getInt('tra_comments', 0));

‎allocations.php‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
switch ($op) {
6161
case 'list':
6262
default:
63-
6463
if ($allocationsCount > 0) {
6564
$GLOBALS['xoTheme']->addStylesheet(WGSIMPLEACC_URL . '/assets/css/nestedsortable.css');
6665
if ($permAllocationsSubmit) {
@@ -79,7 +78,10 @@
7978
$GLOBALS['xoopsTpl']->assign('allocationlist_sort', $allocationlist_sort);
8079
$GLOBALS['xoopsTpl']->assign('allocations_submit', $permAllocationsSubmit);
8180
}
82-
break;
81+
82+
// Breadcrumbs
83+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ALLOCATIONS];
84+
break;
8385
case 'save':
8486
// Security Check
8587
if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -128,6 +130,10 @@
128130
$allocationsObj = $allocationsHandler->create();
129131
$form = $allocationsObj->getFormAllocations();
130132
$GLOBALS['xoopsTpl']->assign('form', $form->render());
133+
134+
// Breadcrumbs
135+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ALLOCATIONS, 'link' => 'allocations.php?op=list'];
136+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ALLOCATION_ADD];
131137
break;
132138
case 'edit':
133139
// Check params
@@ -143,6 +149,10 @@
143149

144150
$form = $allocationsObj->getFormAllocations();
145151
$GLOBALS['xoopsTpl']->assign('form', $form->render());
152+
153+
// Breadcrumbs
154+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ALLOCATIONS, 'link' => 'allocations.php?op=list'];
155+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ALLOCATION_EDIT];
146156
break;
147157
case 'delete':
148158
// Check params
@@ -188,6 +198,10 @@
188198
\sprintf(\_MA_WGSIMPLEACC_FORM_SURE_DELETE, $allocationsObj->getVar('all_name')));
189199
$form = $xoopsconfirm->getFormXoopsConfirm();
190200
$GLOBALS['xoopsTpl']->assign('form', $form->render());
201+
202+
// Breadcrumbs
203+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ALLOCATIONS, 'link' => 'allocations.php?op=list'];
204+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ALLOCATION_EDIT];
191205
}
192206
break;
193207
case 'order':
@@ -217,9 +231,6 @@
217231
break;
218232
}
219233

220-
// Breadcrumbs
221-
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ALLOCATIONS];
222-
223234
// Keywords
224235
wgsimpleaccMetaKeywords($helper->getConfig('keywords') . ', ' . \implode(',', $keywords));
225236
unset($keywords);

‎assets.php‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@
9191
$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
9292
}
9393
}
94+
// Breadcrumbs
95+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ASSETS];
9496
break;
9597
case 'save':
9698
// Security Check
@@ -138,6 +140,10 @@
138140
$assetsObj = $assetsHandler->create();
139141
$form = $assetsObj->getFormAssets();
140142
$GLOBALS['xoopsTpl']->assign('form', $form->render());
143+
144+
// Breadcrumbs
145+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ASSETS, 'link' => 'assets.php?op=list'];
146+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ASSET_ADD];
141147
break;
142148
case 'edit':
143149
// Check params
@@ -153,6 +159,9 @@
153159
$assetsObj = $assetsHandler->get($asId);
154160
$form = $assetsObj->getFormAssets();
155161
$GLOBALS['xoopsTpl']->assign('form', $form->render());
162+
// Breadcrumbs
163+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ASSETS, 'link' => 'assets.php?op=list'];
164+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ASSET_EDIT];
156165
break;
157166
case 'delete':
158167
// Check params
@@ -201,13 +210,14 @@
201210
\sprintf(\_MA_WGSIMPLEACC_FORM_SURE_DELETE, $assetsObj->getVar('as_name')));
202211
$form = $xoopsconfirm->getFormXoopsConfirm();
203212
$GLOBALS['xoopsTpl']->assign('form', $form->render());
213+
214+
// Breadcrumbs
215+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ASSETS, 'link' => 'assets.php?op=list'];
216+
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ASSET_EDIT];
204217
}
205218
break;
206219
}
207220

208-
// Breadcrumbs
209-
$xoBreadcrumbs[] = ['title' => \_MA_WGSIMPLEACC_ASSETS];
210-
211221
// Keywords
212222
wgsimpleaccMetaKeywords($helper->getConfig('keywords') . ', ' . \implode(',', $keywords));
213223
unset($keywords);

‎assets/icons/16/status1.png‎

1.7 KB
Loading

‎assets/icons/16/status2.png‎

1.47 KB
Loading

‎assets/icons/16/status3.png‎

-771 Bytes
Loading

‎assets/icons/16/status4.png‎

-1.47 KB
Loading

‎assets/icons/16/status6.png‎

-2.24 KB
Binary file not shown.

0 commit comments

Comments
 (0)