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.

Sign up for GitHub

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

Jump to bottom

Dev #160

Merged
merged 73 commits into from
Jun 26, 2023
Merged

Dev #160

merged 73 commits into from
Jun 26, 2023

Commits on May 13, 2023

  1. Update Search Product and use API Provinces

    @quanghuy89
    quanghuy89 committed May 13, 2023
    Configuration menu
    Copy the full SHA
    8599fad View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. validation form

    @qnt078
    qnt078 committed May 15, 2023
    Configuration menu
    Copy the full SHA
    d6e8c3d View commit details
    Browse the repository at this point in the history

  2. Testing service (#117) 

    * update category service test

* update product service test

* update user service test

* update user address service test

* update authenticate service test

* update order service test

* update order detail service test

* update rating service test
    @letiendat1002
    letiendat1002 committed May 15, 2023
    Configuration menu
    Copy the full SHA
    cc97705 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Shipping api (#118) 

    * add role shipper and update permission

* update database attribute

* update and implement order service logic for shipping

* implement shipping API

* implement statistic API

* add get by role user API for order statistic

* clean code
    @letiendat1002
    letiendat1002 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    7f2534b View commit details
    Browse the repository at this point in the history

  2. update get refund api

    @letiendat1002
    letiendat1002 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    257bb68 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #121 from letiendat1002/order-refund-update-api 

    Update get refund api
    @quanghuy89
    quanghuy89 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    746bf21 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. update-validation-phone

    @qnt078
    qnt078 committed May 18, 2023
    Configuration menu
    Copy the full SHA
    66c282a View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. tt

    @qnt078
    qnt078 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    7129176 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into validation

    @qnt078
    qnt078 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    11edee8 View commit details
    Browse the repository at this point in the history

  3. update

    @qnt078
    qnt078 committed May 19, 2023
    Configuration menu
    Copy the full SHA
    a48a3f2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #124 from letiendat1002/validation 

    Validation Form
    @trandangnguyenbao
    trandangnguyenbao committed May 19, 2023
    Configuration menu
    Copy the full SHA
    1ae7513 View commit details
    Browse the repository at this point in the history

  5. update

    @trandangnguyenbao
    trandangnguyenbao committed May 19, 2023
    Configuration menu
    Copy the full SHA
    c7bd302 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' of https://github.com/letiendat1002/e-commerce int… 

    …o dev
    @trandangnguyenbao
    trandangnguyenbao committed May 19, 2023
    Configuration menu
    Copy the full SHA
    bda5ef3 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2023

  1. FIX: FIX Bu User and UI Dashboard Admin

    @trandangnguyenbao
    trandangnguyenbao committed May 20, 2023
    Configuration menu
    Copy the full SHA
    5d49b0b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #125 from letiendat1002/FET-28 

    Fet 28
    @trandangnguyenbao
    trandangnguyenbao committed May 20, 2023
    Configuration menu
    Copy the full SHA
    2601f99 View commit details
    Browse the repository at this point in the history

  3. updatechangePassword

    @qnt078
    qnt078 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    24c8b6c View commit details
    Browse the repository at this point in the history

  4. test code

    @trandangnguyenbao
    trandangnguyenbao committed May 20, 2023
    Configuration menu
    Copy the full SHA
    9eb9e51 View commit details
    Browse the repository at this point in the history

  5. updateRegister

    @qnt078
    qnt078 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    ad77a26 View commit details
    Browse the repository at this point in the history

  6. u

    @qnt078
    qnt078 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    f691cb2 View commit details
    Browse the repository at this point in the history

  7. t

    @qnt078
    qnt078 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    6e7bf4d View commit details
    Browse the repository at this point in the history

  8. update

    @qnt078
    qnt078 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    ffbabf2 View commit details
    Browse the repository at this point in the history

  9. update

    @qnt078
    qnt078 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    4b7b76e View commit details
    Browse the repository at this point in the history

  10. completed split into 2 status

    @letiendat1002
    letiendat1002 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    24a9115 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #127 from letiendat1002/update-shipping-status-1 

    Update Order Status
    @trandangnguyenbao
    trandangnguyenbao committed May 20, 2023
    Configuration menu
    Copy the full SHA
    d367a5e View commit details
    Browse the repository at this point in the history

  12. FEAT: Handle Order and Style Step shipping

    @trandangnguyenbao
    trandangnguyenbao committed May 20, 2023
    Configuration menu
    Copy the full SHA
    60e0dcb View commit details
    Browse the repository at this point in the history

  13. Merge pull request #128 from letiendat1002/EC-28 

    Ec 28
    @quanghuy89
    quanghuy89 committed May 20, 2023
    Configuration menu
    Copy the full SHA
    1a23fb9 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2023

  1. Resolve confilct

    @quanghuy89
    quanghuy89 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    fa2c1cb View commit details
    Browse the repository at this point in the history

  2. Search product User and Back to Top

    @quanghuy89
    quanghuy89 committed May 21, 2023
    Configuration menu
    Copy the full SHA
    d01b737 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Update search Client

    @quanghuy89
    quanghuy89 committed May 22, 2023
    Configuration menu
    Copy the full SHA
    b699e54 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/letiendat1002/e-commerce int… 

    …o validation
    @qnt078
    qnt078 committed May 22, 2023
    Configuration menu
    Copy the full SHA
    9e4a8e4 View commit details
    Browse the repository at this point in the history

  3. updateN

    @qnt078
    qnt078 committed May 22, 2023
    Configuration menu
    Copy the full SHA
    9fc12b4 View commit details
    Browse the repository at this point in the history

  4. ud

    @qnt078
    qnt078 committed May 22, 2023
    Configuration menu
    Copy the full SHA
    3150d5f View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. FEAT: Handle Roles Shipper

    @trandangnguyenbao
    trandangnguyenbao committed May 23, 2023
    Configuration menu
    Copy the full SHA
    f1451ec View commit details
    Browse the repository at this point in the history

  2. Merge pull request #131 from letiendat1002/validation 

    [User] Validation Form Update
    @trandangnguyenbao
    trandangnguyenbao committed May 23, 2023
    Configuration menu
    Copy the full SHA
    987ff3b View commit details
    Browse the repository at this point in the history

  3. User address

    @quanghuy89
    quanghuy89 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    82c0c68 View commit details
    Browse the repository at this point in the history

  4. User address

    @quanghuy89
    quanghuy89 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    dc79c97 View commit details
    Browse the repository at this point in the history

  5. Update search both user admin Fix bug view User

    @quanghuy89
    quanghuy89 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    76275f6 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. FEAT

    @trandangnguyenbao
    trandangnguyenbao committed May 24, 2023
    Configuration menu
    Copy the full SHA
    64fe08d View commit details
    Browse the repository at this point in the history

  2. Feature/modify add product (#132) 

    * Update Search Product and use API Provinces

* Search product User and Back to Top

* Update search Client

* User address

* Update search both user admin Fix bug view User

---------

Co-authored-by: Dinh Quang Huy <dinhquanghuy0809@gmail.com>
    @trandangnguyenbao @quanghuy89
    trandangnguyenbao and quanghuy89 committed May 24, 2023
    Configuration menu
    Copy the full SHA
    dd81f4b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'EC-29' of https://github.com/letiendat1002/e-commerce i… 

    …nto EC-29
    @qnt078
    qnt078 committed May 24, 2023
    Configuration menu
    Copy the full SHA
    0d7b733 View commit details
    Browse the repository at this point in the history

  4. add

    @trandangnguyenbao
    trandangnguyenbao committed May 24, 2023
    Configuration menu
    Copy the full SHA
    92137d0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #134 from letiendat1002/dev2 

    Feature/modify add product (#132)
    @trandangnguyenbao
    trandangnguyenbao committed May 24, 2023
    Configuration menu
    Copy the full SHA
    7f8143c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into EC-29

    @trandangnguyenbao
    trandangnguyenbao committed May 24, 2023
    Configuration menu
    Copy the full SHA
    524dba9 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #135 from letiendat1002/EC-29 

    Ec 29
    @trandangnguyenbao
    trandangnguyenbao committed May 24, 2023
    Configuration menu
    Copy the full SHA
    918815e View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. LoginAdmin

    @qnt078
    qnt078 committed May 25, 2023
    Configuration menu
    Copy the full SHA
    540b251 View commit details
    Browse the repository at this point in the history

  2. LoginAdmin

    @qnt078
    qnt078 committed May 25, 2023
    Configuration menu
    Copy the full SHA
    93c8d6e View commit details
    Browse the repository at this point in the history

  3. UpdateLoginAdmin

    @qnt078
    qnt078 committed May 25, 2023
    Configuration menu
    Copy the full SHA
    9b30fc0 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Merge pull request #137 from letiendat1002/LoginAdmin 

    Login Admin
    @trandangnguyenbao
    trandangnguyenbao committed May 26, 2023
    Configuration menu
    Copy the full SHA
    bff2b72 View commit details
    Browse the repository at this point in the history

  2. add get shipper with order asc API

    @letiendat1002
    letiendat1002 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    287fc1d View commit details
    Browse the repository at this point in the history

  3. update service test and directory

    @letiendat1002
    letiendat1002 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    0ece41e View commit details
    Browse the repository at this point in the history

  4. update api

    @letiendat1002
    letiendat1002 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    7643fd1 View commit details
    Browse the repository at this point in the history

  5. Update Login Admin

    @quanghuy89
    quanghuy89 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    d024920 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2023

  1. Merge pull request #138 from letiendat1002/update-shipper-api-1 

    Update Shipper API
    @trandangnguyenbao
    trandangnguyenbao committed May 27, 2023
    Configuration menu
    Copy the full SHA
    c9b1115 View commit details
    Browse the repository at this point in the history

  2. Update Shipper

    @trandangnguyenbao
    trandangnguyenbao committed May 27, 2023
    Configuration menu
    Copy the full SHA
    f37189d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/letiendat1002/e-commerce int… 

    …o EC-29
    @trandangnguyenbao
    trandangnguyenbao committed May 27, 2023
    Configuration menu
    Copy the full SHA
    e9152ee View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. Shipper rolse

    @trandangnguyenbao
    trandangnguyenbao committed May 29, 2023
    Configuration menu
    Copy the full SHA
    968e2b5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #139 from letiendat1002/EC-29 

    Ec 29
    @trandangnguyenbao
    trandangnguyenbao committed May 29, 2023
    Configuration menu
    Copy the full SHA
    cf33ed5 View commit details
    Browse the repository at this point in the history

  3. Update Protect Route and Redirect

    @quanghuy89
    quanghuy89 committed May 29, 2023
    Configuration menu
    Copy the full SHA
    f396450 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #115 from letiendat1002/feature/modify-add-product 

    Update Protect Route and redirect
    @quanghuy89
    quanghuy89 committed May 29, 2023
    Configuration menu
    Copy the full SHA
    61a437c View commit details
    Browse the repository at this point in the history

  5. FIX CSS TABLE

    @trandangnguyenbao
    trandangnguyenbao committed May 29, 2023
    Configuration menu
    Copy the full SHA
    3c586cd View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Update Refund UI

    @trandangnguyenbao
    trandangnguyenbao committed May 30, 2023
    Configuration menu
    Copy the full SHA
    7a9a517 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #140 from letiendat1002/EC-31 

    Ec 31
    @trandangnguyenbao
    trandangnguyenbao committed May 30, 2023
    Configuration menu
    Copy the full SHA
    be47ebe View commit details
    Browse the repository at this point in the history

  3. TEST BUG

    @trandangnguyenbao
    trandangnguyenbao committed May 30, 2023
    Configuration menu
    Copy the full SHA
    6ee92c8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #141 from letiendat1002/EC-32 

    TEST BUG
    @trandangnguyenbao
    trandangnguyenbao committed May 30, 2023
    Configuration menu
    Copy the full SHA
    f8c4de0 View commit details
    Browse the repository at this point in the history

  5. Fix validate and redirect

    @quanghuy89
    quanghuy89 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    16af5e7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #142 from letiendat1002/feature/fixBugAdminUser 

    Fix validate and redirect
    @trandangnguyenbao
    trandangnguyenbao committed May 30, 2023
    Configuration menu
    Copy the full SHA
    f1617d8 View commit details
    Browse the repository at this point in the history

  7. Validate fullname

    @quanghuy89
    quanghuy89 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    d81f031 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #143 from letiendat1002/feature/fixBugAdminUser 

    Validate fullname
    @trandangnguyenbao
    trandangnguyenbao committed May 30, 2023
    Configuration menu
    Copy the full SHA
    82ddb27 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. update profile (#150)

    @letiendat1002
    letiendat1002 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    60201c5 View commit details
    Browse the repository at this point in the history

  2. Ci cd 1 (#151) 

    * update profile
    @letiendat1002
    letiendat1002 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    79d0519 View commit details
    Browse the repository at this point in the history

  3. Ci cd 1 (#152) 

    * update profile

* update profile

* fix cors
    @letiendat1002
    letiendat1002 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bfe8638 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Ci cd 1 (#155) 

    * update profile

* update profile

* fix cors

* Bump guava from 31.1-jre to 32.0.0-jre
    @letiendat1002
    letiendat1002 committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    2020d2d View commit details
    Browse the repository at this point in the history

  2. Ci cd 1 (#159) 

    * update profile

* update profile

* fix cors

* Bump guava from 31.1-jre to 32.0.0-jre
    @letiendat1002
    letiendat1002 committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    4948ae3 View commit details
    Browse the repository at this point in the history