Post by xxvirusxx » Sat Jun 13, 2020 9:54 pm

In catalog/controller/account/affiliate.php missing some lines. Getform function

Code: Select all

		$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/moment/moment.min.js');
		$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/moment/moment-with-locales.min.js');
		$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/bootstrap-datetimepicker.min.js');
		$this->document->addStyle('catalog/view/javascript/jquery/datetimepicker/bootstrap-datetimepicker.min.css');
If is affiliate controller in account, I don't understand why is another register controller in affiliate folder.

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 » Sat Jun 13, 2020 9:58 pm

xxvirusxx wrote:
Sat Jun 13, 2020 9:54 pm
In catalog/controller/account/affiliate.php missing some lines. Getform function

Code: Select all

		$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/moment/moment.min.js');
		$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/moment/moment-with-locales.min.js');
		$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/bootstrap-datetimepicker.min.js');
		$this->document->addStyle('catalog/view/javascript/jquery/datetimepicker/bootstrap-datetimepicker.min.css');
If is affiliate controller in account, I don't understand why is another register controller in affiliate folder.
In the catalog/controller/affiliate/register.php file, I don't see the getForm() method. The lines as you described for that controller, however, are already added:

Code: Select all

$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/moment/moment.min.js');
		$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/moment/moment-with-locales.min.js');
		$this->document->addScript('catalog/view/javascript/jquery/datetimepicker/bootstrap-datetimepicker.min.js');
		$this->document->addStyle('catalog/view/javascript/jquery/datetimepicker/bootstrap-datetimepicker.min.css');
As to why there's a separate controller for affiliate registration, I don't agree more than you do on this one. Which is why, one of the reasons to have a features-pre version because affiliates do seem to change a lot between OC versions and the master branch does have different ways to handle affiliates as opposed to the pre-release and previous versions of OC.

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 » Sat Jun 13, 2020 10:00 pm

xxvirusxx wrote:
Sat Jun 13, 2020 9:54 pm
In catalog/controller/account/affiliate.php missing some lines. Getform function

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 » Sat Jun 13, 2020 10:03 pm

xxvirusxx wrote:
Sat Jun 13, 2020 10:00 pm
xxvirusxx wrote:
Sat Jun 13, 2020 9:54 pm
In catalog/controller/account/affiliate.php missing some lines. Getform function
Ok, fixed. You meant the account folder. Even more complicated to work on two different locations for the same feature. I'll have to put the master branch version of the integration for the affiliate on the list in the features-pre.

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 » Sat Jun 13, 2020 10:06 pm

Same for Master Branch. register is still there :)

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 » Sat Jun 13, 2020 10:07 pm

xxvirusxx wrote:
Sat Jun 13, 2020 10:06 pm
Same for Master Branch. register is still there :)
Correct. However, I was referring to the controller/affiliate folder for the features-pre.

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 » Sat Jun 13, 2020 10:09 pm

Maybe someday...... login, register will be moved in affiliate controller :)

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 » Sat Jun 13, 2020 10:14 pm

Ok, package re-uploaded.

- Fixed admin controller customer custom fields lookup.
- Fixed catalog controller account affiliate JS loads.

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 » Sat Jun 13, 2020 10:30 pm

catalog/view/theme/default/template/account/ is missing some form-group required

- Cheque Payee Name
- PayPal Email Account
- Account Name
- Account Number

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 » Sat Jun 13, 2020 10:33 pm

xxvirusxx wrote:
Sat Jun 13, 2020 10:30 pm
catalog/view/theme/default/template/account/ is missing some form-group required

- Cheque Payee Name
- PayPal Email Account
- Account Name
- Account Number
Please provide the exact locations - with codes!

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 » Sat Jun 13, 2020 10:43 pm

This code:

Code: Select all

          <div class="form-group payment" id="payment-cheque">
            <label class="col-sm-2 control-label" for="input-cheque">{{ entry_cheque }}</label>
            <div class="col-sm-10">
              <input type="text" name="cheque" value="{{ cheque }}" placeholder="{{ entry_cheque }}" id="input-cheque" class="form-control" />
              {% if error_cheque %}
              <div class="text-danger">{{ error_cheque }}</div>
              {% endif %}              
            </div>
          </div>
Should be this:

Code: Select all

          <div id="payment-cheque" class="payment">
           <div class="form-group required">
            <label class="col-sm-2 control-label" for="input-cheque">{{ entry_cheque }}</label>
            <div class="col-sm-10">
              <input type="text" name="cheque" value="{{ cheque }}" placeholder="{{ entry_cheque }}" id="input-cheque" class="form-control" />
              {% if error_cheque %}
              <div class="text-danger">{{ error_cheque }}</div>
              {% endif %}              
            </div>
           </div>
          </div>
Same for Paypal, and both fields from Bank fields: entry_bank_account_name and entry_bank_account_number.
form-group to form-group required

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 » Sat Jun 13, 2020 11:25 pm

Done. Also fixed the following line to read:

Code: Select all

<div id="payment-bank" class="payment">

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 derzet » Sun Jun 14, 2020 12:49 am

Could you please have a look into viewtopic.php?f=201&t=218489&p=790748#p790748

There's a Sub-Total calculation/display bug if the shop is set to "Display Prices With Tax"

Newbie

Posts

Joined
Sat Jun 06, 2020 11:17 pm

Post by straightlight » Sun Jun 14, 2020 1:08 am

derzet wrote:
Sun Jun 14, 2020 12:49 am
Could you please have a look into viewtopic.php?f=201&t=218489&p=790748#p790748

There's a Sub-Total calculation/display bug if the shop is set to "Display Prices With Tax"
This topic is to provide solutions to incident requests, not only to report them.

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 » Sun Jun 14, 2020 2:29 am

Bug discovered with seo_url on this commit: https://github.com/opencart/opencart/is ... -638179052 . Will have to add the solution in the upgrade model.

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 » Sun Jun 14, 2020 2:55 am

Package updated.

- Fixed SEO URL database table to read key and value. Removed query field from install/opencart.sql file.
- Fixed catalog account affiliate TWIG file for the ID lookups.

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 » Sun Jun 14, 2020 2:58 am

Another commit reported for fas instead of fa class names: https://github.com/opencart/opencart/is ... -638132819 . This issue has now been fixed.

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 » Sun Jun 14, 2020 3:19 am

Package updated.

- Fixed the catalog product/thumb.twig from fas back to fa CSS element name and the same for the admin currency fixer extension TWIG files.

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 » Sun Jun 14, 2020 4:05 am

Package updated.

- Fixed catalog/controller/account/reset.php file as per this post: viewtopic.php?f=202&t=213020#p790763 and as per the master branch.

- Fixed catalog/model/account/customer.php editPassword() method; reverted back to sha1 until 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 » Sun Jun 14, 2020 9:53 am

Package updated.

- Added SEO URL and new SEO Profiles from master branch.
- Fixed missing icons in product/thumb and product/product catalog page.
- Modified install/opencart.sql file both oc_seo_url and oc_seo_profile to be created.
- Added install/model/upgrade/1010.php file to fill in the oc_seo_profile database table, fields and values.
- Changed VERSION to: 3.0.3.4-core-pre .

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
Who is online

Users browsing this forum: No registered users and 30 guests