forked from erxes/erxes
-
Notifications
You must be signed in to change notification settings - Fork 0
Update from upstream repo erxes/erxes@master #4
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
Open
backstroke-bot
wants to merge
10,000
commits into
itdevsamurai:master
Choose a base branch
from
erxes:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14e8ec8 to
7f17432
Compare
a222487 to
80518a7
Compare
eb27b10 to
2c1d36c
Compare
bbfb4b9 to
a0cc18b
Compare
6cfb873 to
7b64c85
Compare
22699c8 to
67196c9
Compare
2e03d80 to
e48de57
Compare
- Implemented checkLoyalties function to apply loyalty-based discounts to deal products - Updated deal mutations to include loyalty checks before pricing - Fixed type safety in ScoreForm component by making targetId and serviceName optional - Added proper error handling for loyalty checks - Included discount percentage and amount calculations for eligible products - Ensured compatibility with existing product data structure
Introduced chunked file upload endpoints using multer and tmp for handling large file uploads efficiently. Updated dependencies in package.json to include multer and tmp. Refactored index.ts to add chunked upload logic, status tracking, and related endpoints, while maintaining existing upload functionality.
…ed upload support for large files Introduces upload progress indicators for file attachments, including chunked upload support for large files. Updates AttachmentGallery and Uploader components to display progress, and refactors uploadHandler to handle progress events and chunked uploads. Also fixes some type annotations and improves user feedback during uploads.
- Added optional chaining for result[_id] to prevent null reference errors - Skip loyalty processing for items with discountPercent - Update ProductForm total when productsData changes
Introduces a publishedDate field to the GraphQL post schema, updates queries and UI components to display and handle the published date for posts. This enhances post metadata management and visibility of publication timing.
- Replaced hardcoded API URLs with environment variable retrieval using getEnv for better configuration management.
- Updated clientPortalCheckTokiInvoice to use environment variables for API URL retrieval. - Enhanced code readability by formatting object destructuring and API URL assignments. - Ensured consistent error handling and response processing for better maintainability.
- Eliminated console.log statements that output API request details and response for cleaner code. - Focused on improving code readability and reducing unnecessary logging in production environments.
…t error on history
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello!
The upstream repository
erxes/erxes@masterhas some new changes that aren't in this fork. So, here they are, ready to be merged! 🎉If this pull request can be merged without conflict, you can publish your software with these new changes. Otherwise, fix any merge conflicts by clicking the
Resolve Conflictsbutton.If you like Backstroke, consider donating to help us pay for infrastructure here. Backstroke is a completely open source project that's free to use, but we survive on sponsorships and donations. Thanks for your support! Help out Backstroke.
Created by Backstroke (I'm a bot!)