Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into 1.5.0 #144

Merged
merged 30 commits into from
Jul 26, 2021
Merged

Merge master into 1.5.0 #144

merged 30 commits into from
Jul 26, 2021

Conversation

manojLondhe
Copy link
Member

No description provided.

manojLondhe and others added 30 commits August 25, 2020 11:10
…e there against record (#110)

Co-authored-by: “Deepa <“[email protected]”>
…vendor on basis of extension integration (#112)

* Bug #164562 fix: Added function to get list of country,state city of vendor on basis of extension integration

* Bug #164562 fix: Added function to get list of country,state city of vendor on basis of extension integration

Co-authored-by: “Deepa <“[email protected]”>
* Task #165117chore: Make required changes in json file

* Task #165172 chore: Change in mailhelper.php

* Task #165117chore: TJVendor template migration

* Task #165117chore: Make required changes in json file

* Task #165117chore: Make required changes in json file

* Task #165117chore: Make required changes in json file

* Task #165117chore: Make required changes in json file

* Update default.php

Co-authored-by: Deepa Gawade <[email protected]>
Co-authored-by: Manoj L <[email protected]>
…114)

* Task #165117chore: Template Json file changes for fresh installation

* Task #165117chore: Template Json file changes for fresh installation

Co-authored-by: Deepa Gawade <[email protected]>
* Task #164230 chore: Version and Date change

* Task #164230 chore: Version and Date change

* Task #164230 chore: Version and Date change

* Task #164230 chore: Version and Date change

Co-authored-by: Deepa Gawade <[email protected]>
Co-authored-by: Deepa Gawade <[email protected]>
Co-authored-by: Manoj L <[email protected]>
Merge `Release 1.4.2` into `master`
… class (#124)

* Bug #166258 fix: Backend > Error Class 'TJVendors' not found occurs o… (#121)

Co-authored-by: Snehal Patil <[email protected]>

* Bug #166274 chore: Vendor user receives Admin user notifications (#123)

Co-authored-by: Deepa Gawade <[email protected]>

* Task #165603 chore: Added getcountry, city, region function in vendor class

Co-authored-by: snehal patil <[email protected]>
Co-authored-by: Snehal Patil <[email protected]>
Co-authored-by: Deepa Gawade <[email protected]>
:Refactor checkVendor method from common helper

Co-authored-by: DSC <[email protected]>
#128)

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Task #136504 feat: TJ-vendors integration

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed
* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Task #136504 feat: TJ-vendors integration

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Update changelog.md

Co-authored-by: Manoj L <[email protected]>
* Task #169696 fix: Make JGive php8 compatible

* Task #169696 fix: Make com_tjvendors php8 compatible

Co-authored-by: Deepa Gawade <[email protected]>
* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Task #136504 feat: TJ-vendors integration

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Update changelog.md

* Quick2Cart integration changes

* TJ-Vendors q2c integration

* TJ-Vendors q2c integration

* Task #136504 feat: TJ-vendors integration

Co-authored-by: Manoj L <[email protected]>
…eate vendors (#133)

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Task #136504 feat: TJ-vendors integration

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Bug #169366 fix: Housekeeping script of version 1.4.2 gives error for site where TJ-Notifications is not installed

* Update changelog.md

* Quick2Cart integration changes

* TJ-Vendors q2c integration

* TJ-Vendors q2c integration

* Task #136504 feat: TJ-vendors integration

* If TJ-Notifications is disabled then user is unable to create vendors

* If TJ-Notifications is disabled then user is unable to create vendors

* If TJ-Notifications is disabled then user is unable to create vendors

Co-authored-by: Manoj L <[email protected]>
* Task #171108 fix: To add triggers in tjvendors

* Task #171108 fix: To add triggers in tjvendors

* Task #171108 fix: To add triggers in tjvendors

* Task #171108 fix: To add triggers in tjvendors

* Task #171108 fix: To add triggers in tjvendors

* Task #171108 fix: To add triggers in tjvendors

* Task #171108 fix: To add triggers in tjvendors

* Task #171108 fix: To add triggers in tjvendors
* Task #171108 fix: To add triggers in tjvendors

* Task #171108 chore: Version changes

* Task #171108 fix: To add triggers in tjvendors

Co-authored-by: Snehal Patil <[email protected]>
…cessfully saved' message appeared. (#139)

Co-authored-by: Deepa Gawade <[email protected]>
* Extras #171055 Chore: Version Changes

* Task #173189 Chore: Version changes

* Task #173189 Chore: PHP 8 notices fix

* Task #173189 Chore: version changes

* Task #173189 Chore: Verison changes
* Task #173189 Chore: added changes into changelog

* Task #173189 Chore: added changes into changelog

* Task #173189 Chore: added changes into changelog

* Task #173189 Chore: added changes into changelog

* Update changelog.md

Co-authored-by: Manoj L <[email protected]>
Merge `Release 1.4.3` into `master`
@manojLondhe manojLondhe merged commit 6ece7b7 into release-1.5.0 Jul 26, 2021
@scrutinizer-notifier
Copy link

The inspection completed: 12 new issues, 14 updated code elements

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants