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

[Kit Redesign] Phase 1 - Change itemizable source #3750

Draft
wants to merge 62 commits into
base: main
Choose a base branch
from
Draft

[Kit Redesign] Phase 1 - Change itemizable source #3750

wants to merge 62 commits into from

Commits on Jun 6, 2023

  1. KitAllocation model added for inventory in and inventory out

    @zeeshan-haidar
    zeeshan-haidar committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    83347ed View commit details
    Browse the repository at this point in the history

  2. allocate inventory in and out actions added

    @zeeshan-haidar
    zeeshan-haidar committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    2373afb View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Deallocation for inventory in and inventory out added

    @zeeshan-haidar
    zeeshan-haidar committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    3327d74 View commit details
    Browse the repository at this point in the history

  2. spec added for inventory in and inventory out when kit is allocated

    @zeeshan-haidar
    zeeshan-haidar committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    8345ef6 View commit details
    Browse the repository at this point in the history

  3. fixed typo error

    @zeeshan-haidar
    zeeshan-haidar committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    58c8862 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. test case added for kit with multiple line items

    @zeeshan-haidar
    zeeshan-haidar committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    b30215b View commit details
    Browse the repository at this point in the history

  2. testcases added for deallocating inventory_in and inventory_out

    @zeeshan-haidar
    zeeshan-haidar committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    d8d1e7b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3609-kit-allocation-should-create-inventory-in-out
    @zeeshan-haidar
    zeeshan-haidar committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    bef402e View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. rubocop lint applied

    @zeeshan-haidar
    zeeshan-haidar committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    ded1d9e View commit details
    Browse the repository at this point in the history

  2. factory_bot lint fixed

    @zeeshan-haidar
    zeeshan-haidar committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    e049dbc View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3609-kit-allocation-should-create-inventory-in-out
    @zeeshan-haidar
    zeeshan-haidar committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    f3fb846 View commit details
    Browse the repository at this point in the history

  2. removed ruby enum kit_allocation_type

    @zeeshan-haidar
    zeeshan-haidar committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    301a67b View commit details
    Browse the repository at this point in the history

  3. inventory enum added to kit_allocations

    @zeeshan-haidar
    zeeshan-haidar committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    3912f08 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3609-kit-allocation-should-create-inventory-in-out
    @zeeshan-haidar
    zeeshan-haidar committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    11be7a6 View commit details
    Browse the repository at this point in the history

  2. data migration for invetory_in and invetory_out

    @zeeshan-haidar
    zeeshan-haidar committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    256dcf3 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. rubocop linting applied

    @zeeshan-haidar
    zeeshan-haidar committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    592da55 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. column shipping_cost added to distributions

    @zeeshan-haidar
    zeeshan-haidar committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    595b96f View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. added shipping_cost field on distribution form

    @zeeshan-haidar
    zeeshan-haidar committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    b2b377e View commit details
    Browse the repository at this point in the history

  2. save shipping_cost to distribution

    @zeeshan-haidar
    zeeshan-haidar committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    6588d3b View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3609-kit-allocation-should-create-inventory-in-out
    @zeeshan-haidar
    zeeshan-haidar committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    44f6928 View commit details
    Browse the repository at this point in the history

  2. shipping cost label added

    @zeeshan-haidar
    zeeshan-haidar committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    9cbd420 View commit details
    Browse the repository at this point in the history

  3. shipping cost added to export and view

    @zeeshan-haidar
    zeeshan-haidar committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    9df7f46 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3656-add-shipped-to-delivery-method
    @zeeshan-haidar
    zeeshan-haidar committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    ad078b6 View commit details
    Browse the repository at this point in the history

  5. backfill distribution's shipping cost

    @zeeshan-haidar
    zeeshan-haidar committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    15693c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3609-kit-allocation-should-create-inventory-in-out
    @zeeshan-haidar
    zeeshan-haidar committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    16defa1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3656-add-shipped-to-delivery-method
    @zeeshan-haidar
    zeeshan-haidar committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    162a3ab View commit details
    Browse the repository at this point in the history

  3. test case added for distribution shipping_cost

    @zeeshan-haidar
    zeeshan-haidar committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    02c6cd2 View commit details
    Browse the repository at this point in the history

  4. fixed failing specs

    @zeeshan-haidar
    zeeshan-haidar committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    123afb3 View commit details
    Browse the repository at this point in the history

  5. for testing

    @zeeshan-haidar
    zeeshan-haidar committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    32dd83a View commit details
    Browse the repository at this point in the history

  6. fixed faling spec

    @zeeshan-haidar
    zeeshan-haidar committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    2061c4f View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. added test case for shipping cost field

    @zeeshan-haidar
    zeeshan-haidar committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    5325b69 View commit details
    Browse the repository at this point in the history

  2. added distribution shipping cost on view page

    @zeeshan-haidar
    zeeshan-haidar committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    3065054 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3656-add-shipped-to-delivery-method
    @zeeshan-haidar
    zeeshan-haidar committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    9ccbd6e View commit details
    Browse the repository at this point in the history

  2. rubocop linting fixed

    @zeeshan-haidar
    zeeshan-haidar committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    fed4645 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3609-kit-allocation-should-create-inventory-in-out
    @zeeshan-haidar
    zeeshan-haidar committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    8332212 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3656-add-shipped-to-delivery-method
    @zeeshan-haidar
    zeeshan-haidar committed Jun 26, 2023
    Configuration menu
    Copy the full SHA
    55d892a View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. distribution stimulus controller added for shipping cost

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    17cc4de View commit details
    Browse the repository at this point in the history

  2. renamed distribution controller to destribution-delivery

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    bbc1133 View commit details
    Browse the repository at this point in the history

  3. PR requested changes applied

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    5fb7597 View commit details
    Browse the repository at this point in the history

  4. PR requested changes applied

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    d584002 View commit details
    Browse the repository at this point in the history

  5. extra empty line removed

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    5613746 View commit details
    Browse the repository at this point in the history

  6. removed typo error

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    8536f17 View commit details
    Browse the repository at this point in the history

  7. PR requested change applied

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    e19f8cd View commit details
    Browse the repository at this point in the history

  8. PR requested change applied

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    2f6305a View commit details
    Browse the repository at this point in the history

  9. wrapped shipping cost with it's own div

    @zeeshan-haidar
    zeeshan-haidar committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    4f5a04d View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. code refactored with PR requested changes

    @zeeshan-haidar
    zeeshan-haidar committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    ca0df90 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3656-add-shipped-to-delivery-method
    @zeeshan-haidar
    zeeshan-haidar committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    28d152f View commit details
    Browse the repository at this point in the history

  3. rubocop linting fixed

    @zeeshan-haidar
    zeeshan-haidar committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7182d7c View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3656-add-shipped-to-delivery-method
    @zeeshan-haidar
    zeeshan-haidar committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    1f140f0 View commit details
    Browse the repository at this point in the history

  2. code refactored

    @zeeshan-haidar
    zeeshan-haidar committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    e972029 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3609-kit-allocation-should-create-inventory-in-out

# Conflicts:
#	db/schema.rb
    @zeeshan-haidar
    zeeshan-haidar committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    ae7bce2 View commit details
    Browse the repository at this point in the history

  2. removed inventory enum from kit_allocation

    @zeeshan-haidar
    zeeshan-haidar committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    df1410e View commit details
    Browse the repository at this point in the history

  3. added kit_allocation_type enum

    @zeeshan-haidar
    zeeshan-haidar committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    7bb7a4e View commit details
    Browse the repository at this point in the history

  4. renamed invetory enum to kit_allocation_type

    @zeeshan-haidar
    zeeshan-haidar committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    e19f699 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. code refactored

    @zeeshan-haidar
    zeeshan-haidar committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    6a14d6c View commit details
    Browse the repository at this point in the history

  2. Merge branch '3656-add-shipped-to-delivery-method' of github.com:zees… 

    …han-haidar/human-essentials into 3609-kit-allocation-should-create-inventory-in-out
    @zeeshan-haidar
    zeeshan-haidar committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    c298036 View commit details
    Browse the repository at this point in the history

  3. added itemizable module to base item class

    @zeeshan-haidar
    zeeshan-haidar committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    b822b57 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. rake task added to change itemizable_id for kits' line_items

    @zeeshan-haidar
    zeeshan-haidar committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    fc9ea26 View commit details
    Browse the repository at this point in the history

  2. migration added to change itemizable_id

    @zeeshan-haidar
    zeeshan-haidar committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    fe64cb6 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. fixed line_item.item_id issue

    @zeeshan-haidar
    zeeshan-haidar committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    a357379 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Merge branch 'main' of github.com:zeeshan-haidar/human-essentials int… 

    …o 3707-change-itemizable-source

# Conflicts:
#	db/migrate/20230606061826_create_kit_allocations.rb
#	db/migrate/20230612075547_add_kit_allocation_type_to_kit_allocations.rb
    @zeeshan-haidar
    zeeshan-haidar committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    9bba2c3 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. changed the view logic to fetch line_items form items instead of kits

    @zeeshan-haidar
    zeeshan-haidar committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    88c6eba View commit details
    Browse the repository at this point in the history