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

주문 상세 api 연동, 주문 취소 api연동 #194

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open

주문 상세 api 연동, 주문 취소 api연동 #194

wants to merge 44 commits into from

Commits on Mar 23, 2023

  1. feat: 이미지 연결 코드 수정

    @ddubii
    ddubii committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    99bdbc2 View commit details
    Browse the repository at this point in the history

  2. 3차 api -> keki-dev.store

    @ddubii
    ddubii committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    7469685 View commit details
    Browse the repository at this point in the history

  3. chore: 이미지 코드 (추가)

    @ddubii
    ddubii committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    8b60592 View commit details
    Browse the repository at this point in the history

  4. chore: 캘린더 API 변경사항 수정

    @ddubii
    ddubii committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    885fa85 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. chore: 이미지 크기 수정

    @ddubii
    ddubii committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    1ee7af6 View commit details
    Browse the repository at this point in the history

  2. fix: 파이어베이스용 코드 수정

    @ddubii
    ddubii committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    30a36de View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2023

  1. fix: 파이어베이스 용 코드 수정

    @ddubii
    ddubii committed Mar 26, 2023
    Configuration menu
    Copy the full SHA
    59bc23a View commit details
    Browse the repository at this point in the history

  2. fix: 프로필 이미지 없을 경우 생기는 오류 해결

    @Nya128
    Nya128 committed Mar 26, 2023
    Configuration menu
    Copy the full SHA
    998d889 View commit details
    Browse the repository at this point in the history

  3. fix: store main activity 해당 store에 맞게 보여주도록 수정

    @OliviaYJH
    OliviaYJH committed Mar 26, 2023
    Configuration menu
    Copy the full SHA
    55f87f7 View commit details
    Browse the repository at this point in the history

  4. fix: ConsumerStoreFeedAdapter에 defaultImg 설정하기

    @OliviaYJH
    OliviaYJH committed Mar 26, 2023
    Configuration menu
    Copy the full SHA
    88d43ae View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. chore: 구매자 one feed, 구매자 스토어 메인 xml에서 판매자 프로필 사진 default image 설정 및 구… 

    …매자 스토어 메인에서 파이어베이스 사진도 뜨도록 수정
    @Nya128
    Nya128 committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    b32b02d View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. feature : 판매자 주문 내역 xml 생성

    @1000oki
    1000oki committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    3369be5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #174 from Kek-i/chore/172-change-img-link-code 

    feat: 이미지 연결 코드 수정
    @ddubii
    ddubii authored Mar 29, 2023
    Configuration menu
    Copy the full SHA
    ba13a7d View commit details
    Browse the repository at this point in the history

  3. feat: 주문 화면 ui 완성

    @OliviaYJH
    OliviaYJH committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    5810132 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. feat: 주문 완료 UI 생성

    @OliviaYJH
    OliviaYJH committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    cdc3b3e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/175-consumer-order-ui

    @OliviaYJH
    OliviaYJH authored Mar 30, 2023
    Configuration menu
    Copy the full SHA
    95cddd1 View commit details
    Browse the repository at this point in the history

  3. feat: 확인 버튼 클릭 후 StoreMainActivity로 이동

    @OliviaYJH
    OliviaYJH committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    cf27bb0 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/feature/175-consumer-order-ui' i… 

    …nto feature/175-consumer-order-ui
    @OliviaYJH
    OliviaYJH committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    77e2fc2 View commit details
    Browse the repository at this point in the history

  5. chore : 판매자 주문 내역 ui 수정

    @1000oki
    1000oki committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    8cdbf79 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. chore : string.xml, dimens.xml 파일을 이용해 문자와 margin 변경

    @1000oki
    1000oki committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    127d4d4 View commit details
    Browse the repository at this point in the history

  2. feature : 소비자 주문 상세 ui 생성

    @1000oki
    1000oki committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    da0be34 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. feat: 구매자 주문 내역 UI 완성

    @OliviaYJH
    OliviaYJH committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    bb0ee14 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #177 from Kek-i/feature/175-consumer-order-ui 

    Feature/175 consumer order UI
    @OliviaYJH
    OliviaYJH authored Apr 4, 2023
    Configuration menu
    Copy the full SHA
    617f0e8 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. feat: 판매자 구매 내역 UI

    @OliviaYJH
    OliviaYJH committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    814d652 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. feature : 주문 취소, 주문 안내 다이얼로그 생성

    @1000oki
    1000oki committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    448cce8 View commit details
    Browse the repository at this point in the history

  2. chore : 이름 변경

    @1000oki
    1000oki committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    9652a17 View commit details
    Browse the repository at this point in the history

  3. feature : 취소 UI 생성

    @1000oki
    1000oki committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    ed7fed2 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. chore : 주문 현황 글씨 크기 변경

    @1000oki
    1000oki committed May 4, 2023
    Configuration menu
    Copy the full SHA
    fb19433 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Merge pull request #180 from Kek-i/feature/178-order-list-ui 

    Feature/178 order list UI
    @OliviaYJH
    OliviaYJH authored May 8, 2023
    Configuration menu
    Copy the full SHA
    9111fb3 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. feat: ConsumerOrderList 주문 내역 조회 api 연결

    @OliviaYJH
    OliviaYJH committed May 9, 2023
    Configuration menu
    Copy the full SHA
    64e97c2 View commit details
    Browse the repository at this point in the history

  2. fix: 주문하기 버튼 활성화

    @OliviaYJH
    OliviaYJH committed May 9, 2023
    Configuration menu
    Copy the full SHA
    96c6007 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. feat: SellerOrderList 주문 내역 조회 api 연결

    @OliviaYJH
    OliviaYJH committed May 11, 2023
    Configuration menu
    Copy the full SHA
    72abe16 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Merge pull request #182 from Kek-i/feature/176-order-detail-ui 

    Feature/176 order detail UI
    @1000oki
    1000oki authored May 15, 2023
    Configuration menu
    Copy the full SHA
    f735a40 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge pull request #185 from Kek-i/feature/184-get-order-list 

    Feature/184 get order list
    @OliviaYJH
    OliviaYJH authored May 31, 2023
    Configuration menu
    Copy the full SHA
    306433d View commit details
    Browse the repository at this point in the history

  2. chore: 배경 마진 변경

    @1000oki
    1000oki committed May 31, 2023
    Configuration menu
    Copy the full SHA
    f21f3d4 View commit details
    Browse the repository at this point in the history

  3. chore : dimens 적용

    @1000oki
    1000oki committed May 31, 2023
    Configuration menu
    Copy the full SHA
    13b6ee6 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2023

  1. Merge pull request #188 from Kek-i/feature/176-order-detail-ui 

    Feature/176 order detail UI
    @1000oki
    1000oki authored Jun 11, 2023
    Configuration menu
    Copy the full SHA
    14aedc3 View commit details
    Browse the repository at this point in the history

  2. chore:판매자 주문 상세 ui 수정

    @1000oki
    1000oki committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    6abfa31 View commit details
    Browse the repository at this point in the history

  3. feat : 판매자 주문 상세 api

    @1000oki
    1000oki committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    468ed2d View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. chore:수정중.,..

    @1000oki
    1000oki committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    166361f View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. feat : 판매자 주문 상세 정보 api연동

    @1000oki
    1000oki committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    4aeabfe View commit details
    Browse the repository at this point in the history

  2. feat : 소비자 주문 상세 api 연동

    @1000oki
    1000oki committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    14be488 View commit details
    Browse the repository at this point in the history

  3. chore : 판매자 주문 취소 상세 정보

    @1000oki
    1000oki committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    e5b04fe View commit details
    Browse the repository at this point in the history

  4. feat : 주문 취소 api 연동

    @1000oki
    1000oki committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    ee5d35e View commit details
    Browse the repository at this point in the history