Clone
 

eliott nicholson <eliott_nicholson@genpt.com> in PulseUI

Merge branch 'patch-2' into 'develop'

Update README.md

See merge request Pulse/PulseUI!216

Merge branch 'feature/PUL-7182_staged-snapshot-dt' into 'develop'

Resolve PUL-7182 "Feature/ staged snapshot dt"

Closes PUL-7182

See merge request Pulse/PulseUI!215

Merge branch 'PUL-7208' into 'develop'

PUL-7208 Bulk Edit Order All should not order parts with min max

Closes PUL-7208

See merge request Pulse/PulseUI!208

Merge branch 'patch-1' into 'develop'

Update README.md

See merge request Pulse/PulseUI!201

Merge branch 'PUL-7205_review_page_join' into 'develop'

[PUL-7205] Modified site product join to be left join rather than inner join

Closes PUL-7205

See merge request Pulse/PulseUI!202

Merge branch 'PUL-7168-Dollar-Limit-UI' into 'develop'

Resolve PUL-7168 "Dollar limit ui"

Closes PUL-7168

See merge request Pulse/PulseUI!194

Merge branch 'PUL-7168-Dollar-Limit-UI' into 'develop'

[PUL-7168]-Dollar-Limit-Session-UI part 5 - fix preference review page

Closes PUL-7168

See merge request Pulse/PulseUI!193

Merge branch 'PUL-7168-Dollar-Limit-UI' into 'develop'

Resolve PUL-7168 "Dollar limit ui"

Closes PUL-7168

See merge request Pulse/PulseUI!192

Merge branch 'develop' into 'PUL-7168-Dollar-Limit-UI'

# Conflicts:

# src/main/webapp/app/src/_scss/pulse.scss

Merge branch 'PUL-7154-pulse-notification-framework-use-beamer' into 'develop'

[PUL-7154] beamer change - change uap.pulse to use prod beamer

Closes PUL-7154

See merge request Pulse/PulseUI!190

Merge branch 'feature/PUL-7162-UAP-BR-230' into 'develop'

Merge UAP BR and Product Override BR into Dev

Closes PUL-7162

See merge request Pulse/PulseUI!184

Merge branch 'PUL-7105-new-numer-order-return-toggle' into 'develop'

[PUL-7105] New Numbers: Quick Filter: "Order & Return" should not be in effect

Closes PUL-7105

See merge request Pulse/PulseUI!175

Merge branch 'PUL-7121-custom-sku-session-order-all-items' into 'develop'

Resolve PUL-7121 "Custom sku session order all items"

Closes PUL-7121

See merge request Pulse/PulseUI!174

Resolve PUL-7121 "Custom sku session order all items"

Merge branch 'PUL_7108_ORANGE_BARS' into 'develop'

[PUL-7108] - added product_rownum to returns filter out dupes on $ totals

See merge request Pulse/PulseUI!171

Merge branch 'PUL-7041' into 'develop'

Resolve PUL-7041

Closes PUL-7041

See merge request Pulse/PulseUI!152

Merge branch 'cherry-pick-e9f074f8' into 'hotfix-nn-error'

Merge branch 'PUL-7103-NN-fails-to-display-skus-on-review-page' into 'hotfix-nn-error'

See merge request Pulse/PulseUI!158

Merge branch 'PUL-7103-NN-fails-to-display-skus-on-review-page' into 'develop'

Resolve PUL-7103 "Nn fails to display skus on review page"

Closes PUL-7103

See merge request Pulse/PulseUI!157

Merge branch 'PUL-7103-NN-fails-to-display-skus-on-review-page' into 'develop'

Resolve PUL-7103 "Nn fails to display skus on review page"

Closes PUL-7103

See merge request Pulse/PulseUI!157

(cherry picked from commit e9f074f817b33466f54c8aa2d99ebe544456dcfd)

dce251cc [PUL-7103] New Numbers Sessions are failing to display NN SKUs on Review Page

6abe30eb [PUL-7103] New Numbers Sessions are failing to display NN SKUs on Review Page

e50953ea [PUL-7103] New Numbers Session- change from PUT to POST

5d8c2c24 PUL-7103 - change from put to post

f82c085b Merge branch 'PUL-7103-NN-fails-to-display-skus-on-review-page' of...

    • -11
    • +15
    /src/main/webapp/app/src/apis/sessionApi.js
Merge branch 'cherry-pick-369ba8df' into 'hotfix-nn-error'

Merge branch 'PUL-7101-New-Number-setup-page-svc-error' into 'develop'

See merge request Pulse/PulseUI!156

Merge branch 'PUL-7099_resend_transmission' into 'develop'

[PUL-7099] - Removed XO/Admin checks on resend-transmission

Closes PUL-7099

See merge request Pulse/PulseUI!154

Merge branch 'bug/PUL-7096_user_timeout_increase' into 'develop'

[PUL-7096] - Timeout increases

Closes PUL-7096

See merge request Pulse/PulseUI!151

[PUL-7096] - Timeout increases

Merge branch 'feature/PUL-6975_UAP_Return_Reason' into 'develop'

[PUL-6975] - Modified uap_reports_v.sql to contain return type and checked script into git

Closes PUL-6975

See merge request Pulse/PulseUI!150

Merge branch 'PUL-7088' into 'develop'

Resolve PUL-7088

Closes PUL-7088

See merge request Pulse/PulseUI!148

Merge branch 'PUL-7088' into 'develop'

PUL-7088 modified the query to take aco_dup_report_pivot_final table into account

Closes PUL-7088

See merge request Pulse/PulseUI!146

Merge branch 'cherry-pick-fe10c11a' into 'develop'

[PUL-6992] - Added isNewNumber to union on Site Product

See merge request Pulse/PulseUI!143

Merge branch 'feature/PUL-7069-BR-changes' into 'develop'

[PUL-7069] - Added DC Old Part Rule and changed Negative On Hand Rule

Closes PUL-7069

See merge request Pulse/PulseUI!135

Merge branch 'PUL-7066_UAP_AUTH' into 'develop'

PUL-7066_UAP_AUTH

Closes PUL-7066

See merge request Pulse/PulseUI!125

Merge branch 'feature/PUL-6992-new-number-inclusion' into 'develop'

[PUL-6992] - Support for New Number inclusions in Standard Sessions

Closes PUL-6992

See merge request Pulse/PulseUI!119