Post by straightlight » Mon Jun 01, 2020 4:41 am

Ok, the package has now been re-uploaded with 98% of what's been done today. First post's change logs has also been updated accordingly.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by xxvirusxx » Mon Jun 01, 2020 5:03 am

xxvirusxx wrote:
Sun May 31, 2020 9:09 pm
- catalog/model/extension/total/sub_total.php, you miss this 'sort_order' => $this->config->get('sub_total_sort_order')
Should be:

Code: Select all

'sort_order' => $this->config->get('total_sub_total_sort_order')

Upgrade Service | OC 2.3.0.2 PHP 8 | My Custom OC 3.0.3.8 | Buy me a beer


User avatar
Expert Member

Posts

Joined
Tue Jul 17, 2012 10:35 pm
Location - România

Post by ADD Creative » Mon Jun 01, 2020 5:05 am

Where are these being committed to on GitHub? I can see that opencart-3.0.3.4-pre.zip has been updated, but this now doesn't match the version 3.0.3.4 pre-release "Source code (zip)" download on the same page. Neither can I find them in the 3.0.x.x_Maintenance branch.

www.add-creative.co.uk


Guru Member

Posts

Joined
Sat Jan 14, 2012 1:02 am
Location - United Kingdom

Post by straightlight » Mon Jun 01, 2020 5:36 am

Same place as it has always been announced for new releases: viewtopic.php?f=2&p=788947#p788947 - news & announcements section.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by xxvirusxx » Mon Jun 01, 2020 5:48 am

- admin/controller/catalog/recurring.php, not same function as in model

Code: Select all

$this->model_catalog_recurring->getRecurringDescription
and model

Code: Select all

public function getDescription
- admin/controller/common/dashboard, changed in master branch

Code: Select all

		// Check install directory exists
		if (is_dir(DIR_APPLICATION . 'install')) {
to:

Code: Select all

		// Check install directory exists
		if (is_dir(DIR_CATALOG . '../install')) {
-filemanager is the same

Code: Select all

		if (isset($this->request->get['ckeditor'])) {
			$data['ckeditor'] = $this->request->get['ckeditor'];
		} else {
			$data['ckeditor'] = '';
		}
- new route in admin/controller/common/security
https://github.com/opencart/opencart/co ... bc45c5e773

Upgrade Service | OC 2.3.0.2 PHP 8 | My Custom OC 3.0.3.8 | Buy me a beer


User avatar
Expert Member

Posts

Joined
Tue Jul 17, 2012 10:35 pm
Location - România

Post by straightlight » Mon Jun 01, 2020 6:09 am

xxvirusxx wrote:
Mon Jun 01, 2020 5:48 am
- admin/controller/catalog/recurring.php, not same function as in model

Code: Select all

$this->model_catalog_recurring->getRecurringDescription
and model

Code: Select all

public function getDescription
- admin/controller/common/dashboard, changed in master branch

Code: Select all

		// Check install directory exists
		if (is_dir(DIR_APPLICATION . 'install')) {
to:

Code: Select all

		// Check install directory exists
		if (is_dir(DIR_CATALOG . '../install')) {
-filemanager is the same

Code: Select all

		if (isset($this->request->get['ckeditor'])) {
			$data['ckeditor'] = $this->request->get['ckeditor'];
		} else {
			$data['ckeditor'] = '';
		}
- new route in admin/controller/common/security
https://github.com/opencart/opencart/co ... bc45c5e773
Not sure what you mean ... both shows the same method names from the controller calling the model and the same name is showing in the model recurring you're showing on the above for: getRecurringDescription ...

As for the DIR_CATALOG in the common/dashboard controller, confirmed - fixed.

As for the file manager, don't know what happened there. It's been fixed and will be ready on the next update.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by xxvirusxx » Mon Jun 01, 2020 6:13 am

Weird...I have download again and recurring..is ok
Was more easy to check if these changes was on github :)

Upgrade Service | OC 2.3.0.2 PHP 8 | My Custom OC 3.0.3.8 | Buy me a beer


User avatar
Expert Member

Posts

Joined
Tue Jul 17, 2012 10:35 pm
Location - România

Post by straightlight » Mon Jun 01, 2020 6:16 am

xxvirusxx wrote:
Mon Jun 01, 2020 6:13 am
Weird...I have download again and recurring..is ok
Was more easy to check if these changes was on github :)
No problem. At least there are 2 more problems you described that were identified.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by straightlight » Mon Jun 01, 2020 6:47 am

If there's nothing further to report regarding major incidents, I will start working on the conventional names before jumping in the common/pagination and product/thumb since I need to catch up a bit on the master branch with the pre-release.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by straightlight » Mon Jun 01, 2020 9:30 am

Replaced $childen_data to $children_data in the catalog/controller/extension/module/filter.php file. Added in pre-release.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by straightlight » Mon Jun 01, 2020 9:38 am

Replaced all conventional names with the new names from the master branch.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by straightlight » Mon Jun 01, 2020 10:28 am

Fixed the admin return controller and model and return_list.twig file from 'status' to 'return_status' in the filter.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by straightlight » Mon Jun 01, 2020 10:29 am

Changed all instances of: config_limit_admin to config_pagination as per the master branch.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by straightlight » Mon Jun 01, 2020 11:32 am

The latest changes of the pre-release has now been uploaded in the releases. Change logs on the first post updated accordinly.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by xxvirusxx » Mon Jun 01, 2020 2:43 pm

Not fixed
xxvirusxx wrote:
Mon Jun 01, 2020 5:03 am
xxvirusxx wrote:
Sun May 31, 2020 9:09 pm
- catalog/model/extension/total/sub_total.php, you miss this 'sort_order' => $this->config->get('sub_total_sort_order')
Should be:

Code: Select all

'sort_order' => $this->config->get('total_sub_total_sort_order')
Still there
straightlight wrote:
Mon Jun 01, 2020 6:09 am
As for the DIR_CATALOG in the common/dashboard controller, confirmed - fixed.
Stil there (admin/controller/common/security)

Code: Select all

if (!$this->user->hasPermission('modify', 'common/developer')) {
- admin/controller/catalog/filter

Wrong:

Code: Select all

$data['filters'] = $this->model_catalog_filter->getGroupDescriptions($this->request->get['filter_group_id']);
Should be:

Code: Select all

$data['filters'] = $this->model_catalog_filter->getDescriptions($this->request->get['filter_group_id']);
Same problem in filter model...line 106 should be getGroupDescriptions

-admin/model/catalog/product.php

At line 311 you use:

Code: Select all

$data['product_filter'] = $this->getFilters($product_id);
But function is wrong, line 466

Code: Select all

public function getProductFilters($product_id) {
Same for options, images

Upgrade Service | OC 2.3.0.2 PHP 8 | My Custom OC 3.0.3.8 | Buy me a beer


User avatar
Expert Member

Posts

Joined
Tue Jul 17, 2012 10:35 pm
Location - România

Post by straightlight » Mon Jun 01, 2020 6:35 pm

xxvirusxx wrote:
Mon Jun 01, 2020 2:43 pm
Not fixed
xxvirusxx wrote:
Mon Jun 01, 2020 5:03 am
xxvirusxx wrote:
Sun May 31, 2020 9:09 pm
- catalog/model/extension/total/sub_total.php, you miss this 'sort_order' => $this->config->get('sub_total_sort_order')
Should be:

Code: Select all

'sort_order' => $this->config->get('total_sub_total_sort_order')
Still there
straightlight wrote:
Mon Jun 01, 2020 6:09 am
As for the DIR_CATALOG in the common/dashboard controller, confirmed - fixed.
Stil there (admin/controller/common/security)

Code: Select all

if (!$this->user->hasPermission('modify', 'common/developer')) {
- admin/controller/catalog/filter

Wrong:

Code: Select all

$data['filters'] = $this->model_catalog_filter->getGroupDescriptions($this->request->get['filter_group_id']);
Should be:

Code: Select all

$data['filters'] = $this->model_catalog_filter->getDescriptions($this->request->get['filter_group_id']);
Same problem in filter model...line 106 should be getGroupDescriptions

-admin/model/catalog/product.php

At line 311 you use:

Code: Select all

$data['product_filter'] = $this->getFilters($product_id);
But function is wrong, line 466

Code: Select all

public function getProductFilters($product_id) {
Same for options, images
Ok, all fixed now. That's because I reversed the package due to the login workaround solution on Github you provided and may have forgot some spots since. The next update should be good in a moment.

As for the common/security, you say: still there. However, I don't see anywhere else on the topic where this issue has been addressed prior.

Also fixed an additional bug in admin/controller/user/api.php - line 372.

Code: Select all

if (!$this->user->hasPermission('modify', 'user/user')) {
to read:

Code: Select all

if (!$this->user->hasPermission('modify', 'user/api')) {

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by xxvirusxx » Mon Jun 01, 2020 6:42 pm

straightlight wrote:
Mon Jun 01, 2020 6:35 pm
As for the common/security, you say: still there. However, I don't see anywhere else on the topic where this issue has been addressed prior.
Controller security use this:

Code: Select all

if (!$this->user->hasPermission('modify', 'common/developer')) {
Normaly should be this:

Code: Select all

if (!$this->user->hasPermission('modify', 'common/security')) {
https://github.com/opencart/opencart/co ... bc45c5e773

Upgrade Service | OC 2.3.0.2 PHP 8 | My Custom OC 3.0.3.8 | Buy me a beer


User avatar
Expert Member

Posts

Joined
Tue Jul 17, 2012 10:35 pm
Location - România

Post by straightlight » Mon Jun 01, 2020 6:46 pm

xxvirusxx wrote:
Mon Jun 01, 2020 6:42 pm
straightlight wrote:
Mon Jun 01, 2020 6:35 pm
As for the common/security, you say: still there. However, I don't see anywhere else on the topic where this issue has been addressed prior.
Controller security use this:

Code: Select all

if (!$this->user->hasPermission('modify', 'common/developer')) {
Normaly should be this:

Code: Select all

if (!$this->user->hasPermission('modify', 'common/security')) {
https://github.com/opencart/opencart/co ... bc45c5e773
Yes, now that it's being mentioned, as said above, it's been fixed now. However, with the provided commit, it's even better.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by straightlight » Mon Jun 01, 2020 6:49 pm

As for the filter with getGroupDescriptions, see this commit line: https://github.com/opencart/opencart/co ... 573e86R331 . It shows getDescriptions.

Edit: Ok, spotted. Group and filters without groups. That was a hard spot to catch.

Dedication and passion goes to those who are able to push and merge a project.

Regards,
Straightlight
Programmer / Opencart Tester


Legendary Member

Posts

Joined
Mon Nov 14, 2011 11:38 pm
Location - Canada, ON

Post by xxvirusxx » Mon Jun 01, 2020 6:56 pm

Check again both coupon files: from Marketing.
In controller is this:

Code: Select all

$history_total = $this->model_marketing_coupon->getCouponHistories
when should be :getHistories

Upgrade Service | OC 2.3.0.2 PHP 8 | My Custom OC 3.0.3.8 | Buy me a beer


User avatar
Expert Member

Posts

Joined
Tue Jul 17, 2012 10:35 pm
Location - România
Who is online

Users browsing this forum: No registered users and 3 guests