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

San branch #88

Closed
wants to merge 42 commits into from
Closed

San branch #88

wants to merge 42 commits into from

Commits on Mar 2, 2020

  1. Swipe Refresh in ManagerInvoiceFragment and Screen Issues 

    Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    6ae2a0a View commit details
    Browse the repository at this point in the history

  2. ref: UploadCallback interface now has ApiResponse to better work with… 

    … errors

- bug/crashes: Detail key missing msg when scheduling

Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    9f25491 View commit details
    Browse the repository at this point in the history

  3. Added Delimiter for cuisines in NearbyRestaurants and implemented des… 

    …ign for NearbyRestaurant closed
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    584859d View commit details
    Browse the repository at this point in the history

  4. Partially converted NearbyRestaurants to Epoxy

    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    ab25e31 View commit details
    Browse the repository at this point in the history

  5. NearbyRestaurant layout orientation fixed

    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    97e15cf View commit details
    Browse the repository at this point in the history

  6. Restaurant opening and closing

    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    e986aab View commit details
    Browse the repository at this point in the history

  7. Removed an extra Logs and Toasts

    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    c09cf1b View commit details
    Browse the repository at this point in the history

  8. Added Util Function for opening

    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    fca7dda View commit details
    Browse the repository at this point in the history

  9. ui: Fixed open/close in nearby restaurants 

    - crash: total is null in manager session on bill change

Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 2, 2020
    Copy the full SHA
    e450582 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. Partial LocationSwitching

    @jeevansurendran
    jeevansurendran committed Mar 4, 2020
    Copy the full SHA
    1183dd6 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. Viewmodel issues fixed

    @jeevansurendran
    jeevansurendran committed Mar 5, 2020
    Copy the full SHA
    2cd6cb8 View commit details
    Browse the repository at this point in the history

  2. LocationSwitchingScreen Implemented 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran
    jeevansurendran committed Mar 5, 2020
    Copy the full SHA
    a4838b6 View commit details
    Browse the repository at this point in the history

  3. Removed @+id in some places 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran
    jeevansurendran committed Mar 5, 2020
    Copy the full SHA
    1e7efd5 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2020

  1. Filtering the restaurants based on CityID 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran
    jeevansurendran committed Mar 7, 2020
    Copy the full SHA
    93b3321 View commit details
    Browse the repository at this point in the history

  2. Fixed Small Issues 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran
    jeevansurendran committed Mar 7, 2020
    Copy the full SHA
    60793c3 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. Added permissions for switch-location

    @jeevansurendran
    jeevansurendran committed Mar 14, 2020
    Copy the full SHA
    8666a5c View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

  1. Fixed Minor Changes 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran
    jeevansurendran committed Mar 15, 2020
    Copy the full SHA
    5a803fc View commit details
    Browse the repository at this point in the history

  2. Fixed bugs in location switch fragment 

    Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 15, 2020
    Copy the full SHA
    6427b98 View commit details
    Browse the repository at this point in the history

  3. PaymentTransactionActivity for past transactions. 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>

Partial commit to get layouts

changes made to tthe transactionDetails
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 15, 2020
    Copy the full SHA
    b129b86 View commit details
    Browse the repository at this point in the history

  4. ClosedOrderDetails and Transaction 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 15, 2020
    Copy the full SHA
    dc79bba View commit details
    Browse the repository at this point in the history

  5. Fixed Minor errors in ClosedTransaction 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>

Deleted SessionOrderItemModel

Signed-off-by: Jeevan Surendran <jvns67@gmail.com>

CLRF line break for CommonOrderDetailFragment replaced with LF

Signed-off-by: Jeevan Surendran <jvns67@gmail.com>

newline character in app/buiild.gradle

Signed-off-by: Jeevan Surendran <jvns67@gmail.com>

Fixed Issues

Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 15, 2020
    Copy the full SHA
    fecd9dc View commit details
    Browse the repository at this point in the history

  6. #83 (comment) fixed and other bugs too 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 15, 2020
    Copy the full SHA
    d4b73b1 View commit details
    Browse the repository at this point in the history

  7. Better Formatting for session and serving time 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 15, 2020
    Copy the full SHA
    9083419 View commit details
    Browse the repository at this point in the history

  8. Reduced the size of formatted text to support small mobiles 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 15, 2020
    Copy the full SHA
    e418076 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Merged PR #82, #83 with fixes 

    - Added swipe refresh in closed sessions listing
- Cleaned Util logic to format duration
- Fixed bug in UserLocationFragment not attached when selecting any option
- Used default SharedPreferences for location too
- Used proper way to use appbar by mentioning theme in manifest
- Used the core manifest for new screens

Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 16, 2020
    Copy the full SHA
    686607e View commit details
    Browse the repository at this point in the history

  2. Google Play 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 16, 2020
    Copy the full SHA
    d395ee4 View commit details
    Browse the repository at this point in the history

  3. RestaurantOrderRemarks layout Fixed 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 16, 2020
    Copy the full SHA
    060cf5c View commit details
    Browse the repository at this point in the history

  4. Added locality to ScheduledSessionCart 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 16, 2020
    Copy the full SHA
    f65fc72 View commit details
    Browse the repository at this point in the history

  5. QSR Food ready uses closed session details endpoint 

    - Fetch missing support improved

Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 16, 2020
    Copy the full SHA
    68b20d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. RazorPay PaymentGateway Partially Implemented

    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 17, 2020
    Copy the full SHA
    ef7e981 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Custom Payment UI fixed and option models added 

    - Integrated Initiate transaction with API when paying for scheduled session
- Defined Payment and Transaction Service interface

Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 18, 2020
    Copy the full SHA
    1b801b3 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. Switched to Razorpay again 

    - UPI Push payment done
- Netbanking list prepared
- AppDatabase code refactor

Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 20, 2020
    Copy the full SHA
    91aea7b View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Razorpay payment done 

    - Used Tez client library
- FormValidation added
- dbStore delegate added
- Razorpay callback works
- Card and UPI mode have proper form validation
- Cleaned Paytm logic in viewmodel
- EnumType Converter to support nullable fields

Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 23, 2020
    Copy the full SHA
    d2bd786 View commit details
    Browse the repository at this point in the history

  2. Added App Build Type Analytics User Property 

    Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 23, 2020
    Copy the full SHA
    e39775a View commit details
    Browse the repository at this point in the history

  3. Added Proguard rules for Razorpay 

    Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 23, 2020
    Copy the full SHA
    39357fc View commit details
    Browse the repository at this point in the history

  4. UI fixes (#85) 

    * Divider line color, Resizing of Location selection, Material Drawer PrimaryTextSize

Signed-off-by: Jeevan Surendran <jvns67@gmail.com>

* created separate dimensions

Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 23, 2020
    Copy the full SHA
    030b6c2 View commit details
    Browse the repository at this point in the history

  5. Created tooltip to give mroe information about GST 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 23, 2020
    Copy the full SHA
    dbe507a View commit details
    Browse the repository at this point in the history

  6. Moved Tax Details to BillHolder 

    Signed-off-by: Jeevan Surendran <jvns67@gmail.com>

 new line character

Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 23, 2020
    Copy the full SHA
    7c32303 View commit details
    Browse the repository at this point in the history

  7. Closing tooltip if cart is closed 

    Co-Author: Shivansh Saini <shivanshs9@gmail.com>
Signed-off-by: Jeevan Surendran <jvns67@gmail.com>
Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @jeevansurendran @shivanshs9
    jeevansurendran authored and shivanshs9 committed Mar 23, 2020
    Copy the full SHA
    a2d47de View commit details
    Browse the repository at this point in the history

  8. Dummy email in razorpay 

    - Double back pressed during payment

Signed-off-by: Shivansh Saini <shivanshs9@gmail.com>
    @shivanshs9
    shivanshs9 committed Mar 23, 2020
    Copy the full SHA
    e222f84 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2020

  1. Update PublicRestaurantProfileActivity.kt 

    textview rating color changes on the basis of rating
    @sanyud24
    sanyud24 committed Sep 3, 2020
    Copy the full SHA
    dcc0159 View commit details
    Browse the repository at this point in the history

  2. Update PublicRestaurantProfileActivity.kt 

    textview rating color changes on the basisi of rating
    @sanyud24
    sanyud24 committed Sep 3, 2020
    Copy the full SHA
    d2e6413 View commit details
    Browse the repository at this point in the history